| commit | ddf8a0d385979065af7be086a4b89b6a645fe340 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Nov 06 12:15:26 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Nov 06 12:15:26 2011 -0800 |
| tree | 5a790adbac4dc30db60bbc3979187f6ac0de0f64 | |
| parent | 9991357259a5718813881bae96d3704bb3f531e2 [diff] | |
| parent | bfa02b0da66965caf46e441270af87edda4fea14 [diff] |
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