diff options
| author | Linus Torvalds | 2018-08-24 22:03:51 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2018-08-24 22:03:51 +0200 |
| commit | d972604f6f87478212f012af5560c4fd4bb2b01d (patch) | |
| tree | 47f043843ccbf0ee609aeb13267a76ed9c26f9fd /drivers/iommu/qcom_iommu.c | |
| parent | Merge tag 'apparmor-pr-2018-08-23' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | dt-bindings: thermal: Allow multiple devices to share cooling map (diff) | |
| download | kernel-qcow2-linux-d972604f6f87478212f012af5560c4fd4bb2b01d.tar.gz kernel-qcow2-linux-d972604f6f87478212f012af5560c4fd4bb2b01d.tar.xz kernel-qcow2-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 'drivers/iommu/qcom_iommu.c')
0 files changed, 0 insertions, 0 deletions