Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 May 2011 17:11:42 +0000 (10:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 May 2011 17:11:42 +0000 (10:11 -0700)
commit74e6392ca3fd445a775dd42b54d5e42cf1e706e6
treeea6f7b1eaeea6b1beb8174a76ff998d51bf0972b
parent09cefbb605ccb07c65f313253268a634e0dcd283
parent582e1b270f6db93007f9af86d4f28fdad3da0505
Merge branch 'hwmon-for-linus' of git://git./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