From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 6 Nov 2011 20:15:26 +0000 (-0800)
Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv... 
X-Git-Tag: v3.2-rc1~37
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ddf8a0d385979065af7be086a4b89b6a645fe340;p=linux-pvops.git

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: (w83627ehf) Fix broken driver init
  hwmon: (coretemp) Fix for non-SMP builds
---

ddf8a0d385979065af7be086a4b89b6a645fe340