tree 03c855e34cc86d5e0dc914321698a1d2dfc11f04
parent 80519bc77b52729ca49b278b67d58715e38b85e9
parent faabd47f7e3a36574abcdff0b3506abb092bbe24
author Linus Torvalds <torvalds@linux-foundation.org> 1278880534 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1278880534 -0700

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

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: Fix autoloading of fschmd on recent Fujitsu machines
  hwmon: (coretemp) Properly label the sensors
  hwmon: (coretemp) Skip duplicate CPU entries
  hwmon: (it87) Fix in7 on IT8720F
  hwmon: (k8temp) Fix temperature reporting for ASB1 processor revisions