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)
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (w83627ehf) Properly report thermal diode sensors


Trivial merge