Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...
authorZhang Rui <rui.zhang@intel.com>
Sun, 21 Dec 2014 14:49:12 +0000 (22:49 +0800)
committerZhang Rui <rui.zhang@intel.com>
Sun, 21 Dec 2014 14:49:12 +0000 (22:49 +0800)
commit32c9edc4e356063e0218362d452a269cfa6798ee
tree43982a1f642c7fedef1cc5f8c247b646582cbe03
parent59c56eb6db0c14fe569b1c9625cb850e52d29d88
parent503ccc3fec4a56cdcfedc507cd1ea0d85e1fbfa2
Merge branch 'fixes' of git://git./linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc
drivers/thermal/db8500_cpufreq_cooling.c
drivers/thermal/imx_thermal.c
drivers/thermal/samsung/exynos_tmu.c
drivers/thermal/thermal_core.c
drivers/thermal/ti-soc-thermal/ti-thermal-common.c
include/linux/thermal.h