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
..
Kconfig	thermal: add stm32 thermal driver	2018-10-25 10:44:52 -07:00
Makefile	thermal: st: fix Makefile typo	2019-01-02 04:47:16 -08:00
st_thermal_memmap.c	thermal: Enhance thermal_zone_device_update for events	2016-09-27 14:35:21 +08:00
st_thermal_syscfg.c	drivers: thermal: st: remove several sparse warnings	2015-04-07 13:43:28 -07:00
st_thermal.c	thermal: st: st_thermal: simplify getting .driver_data	2018-11-30 16:46:57 +08:00
st_thermal.h
stm_thermal.c	thermal: stm32: Fix stm_thermal_read_factory_settings	2018-12-10 20:15:28 -08:00