diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-27 14:33:08 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-27 14:33:08 -0700 |
commit | 7f2145b0d0e838f800f2b37761bd2e625014e09e (patch) | |
tree | 2d6a0a1026059516bc30238251ab1dadfcd17758 /Documentation/acpi/DSD-properties-rules.txt | |
parent | 55bea71ed549398133732425a631b2268446526c (diff) | |
parent | 3105f234e0aba43e44e277c20f9b32ee8add43d4 (diff) |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal updates from Zhang Rui:
"The latest Thermal Management updates for v4.9-rc3:
- Fix a regression introduced by commit
b721ca0d19(thermal/powerclamp: remove cpu whitelist), that
powerclamp driver checks cpu support in a wrong way. From: Eric
Ernst.
- Fix a problem that intel_pch_thermal driver misses passive trip
point when the PCH thermal device has an ACPI companion device
associated. From: Srinivas Pandruvada.
- Add missing support for Haswell PCH thermal sensor. From: Srinivas
Pandruvada"
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
thermal/powerclamp: correct cpu support check
thermal: intel_pch_thermal: Enable Haswell PCH
thermal: intel_pch_thermal: Add an ACPI passive trip
Diffstat (limited to 'Documentation/acpi/DSD-properties-rules.txt')
0 files changed, 0 insertions, 0 deletions