Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Nov 2011 20:15:26 +0000 (12:15 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Nov 2011 20:15:26 +0000 (12:15 -0800)
* '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


Trivial merge