Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 23 Sep 2012 21:50:15 +0000 (14:50 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 23 Sep 2012 21:50:15 +0000 (14:50 -0700)
commit0737c8d7aedfe590010e38c3e3bbdc87affa8c3d
treee3feeb7183c149591dfd89b695baef6bf5218ea9
parent0bf7a7056c7b39502008feb484b95a5877cdf59d
parent5f0ecb907deb1e6f28071ee3bd568903b9da1be4
Merge branch 'hwmon-for-linus' of git://git./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