tree 239bc039efb9bde5f880cd0cde8ab86d044d86ae
parent e9308cfd5ab4ade3d81cf591c7599c3a05a21b04
parent bf164c58e58328c40ebc597a8ac00cc6840f9703
author Linus Torvalds <torvalds@linux-foundation.org> 1318624149 +1200
committer Linus Torvalds <torvalds@linux-foundation.org> 1318624149 +1200

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/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