]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge