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)
commitddf8a0d385979065af7be086a4b89b6a645fe340
tree5a790adbac4dc30db60bbc3979187f6ac0de0f64
parent9991357259a5718813881bae96d3704bb3f531e2
parentbfa02b0da66965caf46e441270af87edda4fea14
Merge branch 'hwmon-for-linus' of git://git./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