From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Aug 2012 20:11:00 +0000 (-0700)
Subject: Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck... 
X-Git-Tag: pci/for-linus~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=807b5169e230b264b7db099f5c694e7df2ff3790;p=users%2Fdwmw2%2Flinux.git

Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull a hwmon fix from Guenter Roeck:
 "One patch with section conflict fixes."

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  sections: Fix section conflicts in drivers/hwmon
---

807b5169e230b264b7db099f5c694e7df2ff3790