diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-23 14:50:15 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-23 14:50:15 -0700 |
commit | 0737c8d7aedfe590010e38c3e3bbdc87affa8c3d (patch) | |
tree | e3feeb7183c149591dfd89b695baef6bf5218ea9 /drivers/s390 | |
parent | 0bf7a7056c7b39502008feb484b95a5877cdf59d (diff) | |
parent | 5f0ecb907deb1e6f28071ee3bd568903b9da1be4 (diff) | |
download | linux-3.10-0737c8d7aedfe590010e38c3e3bbdc87affa8c3d.tar.gz linux-3.10-0737c8d7aedfe590010e38c3e3bbdc87affa8c3d.tar.bz2 linux-3.10-0737c8d7aedfe590010e38c3e3bbdc87affa8c3d.zip |
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 'drivers/s390')
0 files changed, 0 insertions, 0 deletions