Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Sep 2010 19:13:13 +0000 (12:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Sep 2010 19:13:13 +0000 (12:13 -0700)
commitb4d32648c190711177a664af7d51149a8950555e
tree122bebbb0a1a150eee3e13a0f1689f1e8155f933
parent0d70397bc72f2122f9702093cce3039ec3ae7575
parentfff2017354a3a9906862aabbf2a1cae5b4330e40
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 build breakage if SMP is undefined