Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Oct 2011 20:29:09 +0000 (08:29 +1200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Oct 2011 20:29:09 +0000 (08:29 +1200)
commit4c41042d1d4c29e596b31e2d14b26d2940fb24b4
tree239bc039efb9bde5f880cd0cde8ab86d044d86ae
parente9308cfd5ab4ade3d81cf591c7599c3a05a21b04
parentbf164c58e58328c40ebc597a8ac00cc6840f9703
Merge branch 'hwmon-for-linus' of git://git./linux/kernel/git/groeck/linux-staging

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (w83627ehf) Properly report thermal diode sensors