tree ea6f7b1eaeea6b1beb8174a76ff998d51bf0972b
parent 09cefbb605ccb07c65f313253268a634e0dcd283
parent 582e1b270f6db93007f9af86d4f28fdad3da0505
author Linus Torvalds <torvalds@linux-foundation.org> 1306516302 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1306516302 -0700

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

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
  hwmon: (coretemp) Fix section mismatch
  hwmon: (pmbus) Initialize sysfs attributes
  hwmon: (coretemp) Update comments describing the handling of HT CPUs
  hwmon: (coretemp) Initialize sysfs attributes