summaryrefslogtreecommitdiffstats
path: root/arch/sparc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-06 12:15:26 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-06 12:15:26 -0800
commitddf8a0d385979065af7be086a4b89b6a645fe340 (patch)
tree5a790adbac4dc30db60bbc3979187f6ac0de0f64 /arch/sparc
parent9991357259a5718813881bae96d3704bb3f531e2 (diff)
parentbfa02b0da66965caf46e441270af87edda4fea14 (diff)
downloadlinux-ddf8a0d385979065af7be086a4b89b6a645fe340.tar.bz2
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
Diffstat (limited to 'arch/sparc')
0 files changed, 0 insertions, 0 deletions