tree 5a790adbac4dc30db60bbc3979187f6ac0de0f64
parent 9991357259a5718813881bae96d3704bb3f531e2
parent bfa02b0da66965caf46e441270af87edda4fea14
author Linus Torvalds <torvalds@linux-foundation.org> 1320610526 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1320610526 -0800

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/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