summaryrefslogtreecommitdiffstats
path: root/arch/x86/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-09-23 14:50:15 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-09-23 14:50:15 -0700
commit0737c8d7aedfe590010e38c3e3bbdc87affa8c3d (patch)
treee3feeb7183c149591dfd89b695baef6bf5218ea9 /arch/x86/Makefile
parent0bf7a7056c7b39502008feb484b95a5877cdf59d (diff)
parent5f0ecb907deb1e6f28071ee3bd568903b9da1be4 (diff)
downloadop-kernel-dev-0737c8d7aedfe590010e38c3e3bbdc87affa8c3d.zip
op-kernel-dev-0737c8d7aedfe590010e38c3e3bbdc87affa8c3d.tar.gz
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull hwmon subsystem fixes from Jean Delvare. * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: hwmon: (fam15h_power) Tweak runavg_range on resume hwmon: (coretemp) Use get_online_cpus to avoid races involving CPU hotplug hwmon: (via-cputemp) Use get_online_cpus to avoid races involving CPU hotplug
Diffstat (limited to 'arch/x86/Makefile')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud