Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next

Browse source

...

This commit is contained in:

Zhang Rui 2018-01-15 13:57:18 +08:00

parent e782bc169c e74c2d65ff 90ce8dfafa

commit 134f401079

10 changed files with 307 additions and 192 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

37

Documentation/devicetree/bindings/thermal/armada-thermal.txt

View file

1

Documentation/devicetree/bindings/thermal/rcar-thermal.txt

View file

4

drivers/thermal/Kconfig

View file

251

drivers/thermal/armada_thermal.c

View file

2

drivers/thermal/hisi_thermal.c

View file

74

drivers/thermal/imx_thermal.c

View file

12

drivers/thermal/int340x_thermal/int3400_thermal.c

View file

9

drivers/thermal/mtk_thermal.c

View file

103

drivers/thermal/tegra/soctherm.c

View file

4

drivers/thermal/x86_pkg_temp_thermal.c

View file