diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-24 13:03:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-24 13:03:51 -0700 |
| commit | d972604f6f87478212f012af5560c4fd4bb2b01d (patch) | |
| tree | 47f043843ccbf0ee609aeb13267a76ed9c26f9fd /arch/um | |
| parent | 57bb8e37d71eac45b6ea9180698a9cc3db945e26 (diff) | |
| parent | d7a4303b8d1fa6f60b73ed91317a51764a2a412c (diff) | |
| download | linux-d972604f6f87478212f012af5560c4fd4bb2b01d.tar.gz linux-d972604f6f87478212f012af5560c4fd4bb2b01d.tar.bz2 linux-d972604f6f87478212f012af5560c4fd4bb2b01d.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal management updates from Zhang Rui:
- Add Daniel Lezcano as the reviewer of thermal framework and SoC
driver changes (Daniel Lezcano).
- Fix a bug in intel_dts_soc_thermal driver, which does not translate
IO-APIC GSI (Global System Interrupt) into Linux irq number (Hans de
Goede).
- For device tree bindings, allow cooling devices sharing same trip
point with same contribution value to share cooling map (Viresh
Kumar).
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
dt-bindings: thermal: Allow multiple devices to share cooling map
MAINTAINERS: Add Daniel Lezcano as designated reviewer for thermal
Thermal: Intel SoC DTS: Translate IO-APIC GSI number to linux irq number
Diffstat (limited to 'arch/um')
0 files changed, 0 insertions, 0 deletions