Linus Torvalds 5c4a60831a Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux ... Pull thermal management updates from Zhang Rui: - Add locking for cooling device sysfs attribute in case the cooling device state is changed by userspace and thermal framework simultaneously. (Thara Gopinath) - Fix a problem that passive cooling is reset improperly after system suspend/resume. (Wei Wang) - Cleanup the driver/thermal/ directory by moving intel and qcom platform specific drivers to platform specific sub-directories. (Amit Kucheria) - Some trivial cleanups. (Lukasz Luba, Wolfram Sang) * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: thermal/intel: fixup for Kconfig string parsing tightening up drivers: thermal: Move QCOM_SPMI_TEMP_ALARM into the qcom subdir drivers: thermal: Move various drivers for intel platforms into a subdir thermal: Fix locking in cooling device sysfs update cur_state Thermal: do not clear passive state during system sleep thermal: zx2967_thermal: simplify getting .driver_data thermal: st: st_thermal: simplify getting .driver_data thermal: spear_thermal: simplify getting .driver_data thermal: rockchip_thermal: simplify getting .driver_data thermal: int340x_thermal: int3400_thermal: simplify getting .driver_data thermal: remove unused function parameter		2019-01-05 16:07:28 -08:00
..
broadcom	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal	2019-01-05 16:01:16 -08:00
intel	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux	2019-01-05 16:07:28 -08:00
qcom	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux	2019-01-05 16:07:28 -08:00
samsung	thermal: samsung: Remove Exynos5440 clock handling left-overs	2018-07-27 16:21:40 -07:00
st	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux	2019-01-05 16:07:28 -08:00
tegra	thermal: tegra: soctherm: Change to use DEFINE_SHOW_ATTRIBUTE macro	2019-01-02 04:47:14 -08:00
ti-soc-thermal	thermal: ti-soc-thermal: remove dead code	2018-07-27 14:43:01 -07:00
Kconfig	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux	2019-01-05 16:07:28 -08:00
Makefile	drivers: thermal: Move QCOM_SPMI_TEMP_ALARM into the qcom subdir	2018-12-07 16:49:02 +08:00
armada_thermal.c	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal	2019-01-05 16:01:16 -08:00
clock_cooling.c	…
cpu_cooling.c	…
da9062-thermal.c	thermal: da9062/61: Prevent hardware access during system suspend	2018-10-25 10:44:55 -07:00
db8500_thermal.c	…
devfreq_cooling.c	…
dove_thermal.c	…
fair_share.c	…
gov_bang_bang.c	…
hisi_thermal.c	thermal/drivers/hisi: Fix number of sensors on hi3660	2018-12-10 20:13:09 -08:00
imx_thermal.c	thermal: imx: save one condition block for normal case of nvmem initialization	2019-01-02 04:47:12 -08:00
kirkwood_thermal.c	…
max77620_thermal.c	…
mtk_thermal.c	thermal: mediatek: use of_device_get_match_data()	2018-05-06 16:53:47 -07:00
of-thermal.c	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal	2018-10-26 12:04:29 -07:00
power_allocator.c	…
qoriq_thermal.c	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal	2018-10-26 12:04:29 -07:00
rcar_gen3_thermal.c	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal	2018-10-26 12:04:29 -07:00
rcar_thermal.c	thermal: rcar_thermal: add R8A77990 support	2019-01-02 04:47:22 -08:00
rockchip_thermal.c	thermal: rockchip_thermal: simplify getting .driver_data	2018-11-30 16:46:56 +08:00
spear_thermal.c	thermal: spear_thermal: simplify getting .driver_data	2018-11-30 16:46:56 +08:00
step_wise.c	…
tango_thermal.c	…
thermal-generic-adc.c	thermal: generic-adc: Fix adc to temp interpolation	2019-01-02 04:47:23 -08:00
thermal_core.c	Thermal: do not clear passive state during system sleep	2018-11-30 16:53:13 +08:00
thermal_core.h	drivers: thermal: Update license to SPDX format	2018-05-30 14:46:17 +08:00
thermal_helpers.c	drivers: thermal: Update license to SPDX format	2018-05-30 14:46:17 +08:00
thermal_hwmon.c	thermal_hwmon: Pass the originating device down to hwmon_device_register_with_info	2018-07-27 14:43:21 -07:00
thermal_hwmon.h	thermal: hwmon: inline helpers when CONFIG_THERMAL_HWMON is not set	2019-01-02 04:43:00 -08:00
thermal_sysfs.c	thermal: Fix locking in cooling device sysfs update cur_state	2018-11-30 16:57:51 +08:00
uniphier_thermal.c	thermal: uniphier: Convert to SPDX identifier	2019-01-02 04:47:16 -08:00
user_space.c	…
zx2967_thermal.c	thermal: zx2967_thermal: simplify getting .driver_data	2018-11-30 16:46:57 +08:00