From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 27 May 2011 17:11:42 +0000 (-0700)
Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec... 
X-Git-Tag: v3.0-rc1~50
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=74e6392ca3fd445a775dd42b54d5e42cf1e706e6;p=karo-tx-linux.git

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
---

74e6392ca3fd445a775dd42b54d5e42cf1e706e6