From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 28 Sep 2010 19:13:13 +0000 (-0700)
Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec... 
X-Git-Tag: v2.6.36-rc6~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4d32648c190711177a664af7d51149a8950555e;p=thirdparty%2Flinux.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 build breakage if SMP is undefined
---

b4d32648c190711177a664af7d51149a8950555e