Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...

diff --cc drivers/thermal/db8500_cpufreq_cooling.c
Simple merge

diff --cc drivers/thermal/imx_thermal.c
Simple merge

diff --cc drivers/thermal/samsung/exynos_tmu.c
Simple merge

diff --cc drivers/thermal/thermal_core.c
Simple merge

diff --cc drivers/thermal/ti-soc-thermal/ti-thermal-common.c
Simple merge

diff --cc include/linux/thermal.h
Simple merge