diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-14 19:01:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-14 19:01:31 -0700 |
| commit | 0043ee40f98d15a50721fbd5dbf7c7797f8d03cd (patch) | |
| tree | f16eff37444228ab626ae83b31c37c9c81becc73 /Makefile | |
| parent | 4ef870e373382f18de214f61e5d5eb83b62b7aa5 (diff) | |
| parent | 1577ddfac75ff9690ebd0d210bc7f1345c9d29ef (diff) | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal updates from Zhang Rui:
- Fix a race condition when updating cooling device, which may lead to
a situation where a thermal governor never updates the cooling
device. From Michele Di Giorgio.
- Fix a zero division error when disabling the forced idle injection
from the intel powerclamp. From Petr Mladek.
- Add suspend/resume callback for intel_pch_thermal thermal driver.
From Srinivas Pandruvada.
- Another two fixes for clocking cooling driver and hwmon sysfs I/F.
From Michele Di Giorgio and Kuninori Morimoto.
[ Hmm. That suspend/resume callback for intel_pch_thermal doesn't look
like a fix, but I'm letting it slide.. - Linus ]
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
thermal: clock_cooling: Fix missing mutex_init()
thermal: hwmon: EXPORT_SYMBOL_GPL for thermal hwmon sysfs
thermal: fix race condition when updating cooling device
thermal/powerclamp: Prevent division by zero when counting interval
thermal: intel_pch_thermal: Add suspend/resume callback
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions