tree 122bebbb0a1a150eee3e13a0f1689f1e8155f933
parent 0d70397bc72f2122f9702093cce3039ec3ae7575
parent fff2017354a3a9906862aabbf2a1cae5b4330e40
author Linus Torvalds <torvalds@linux-foundation.org> 1285701193 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1285701193 -0700

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