Zhang Rui d13cb03aef Merge branch 'thermal' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux into next ... Conflicts: drivers/thermal/cpu_cooling.c		2013-04-15 09:26:58 +08:00
..
armada_thermal.c	thermal: Add driver for Armada 370/XP SoC thermal management	2013-04-02 21:04:09 +08:00
cpu_cooling.c	Merge branch 'thermal' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux into next	2013-04-15 09:26:58 +08:00
db8500_cpufreq_cooling.c	thermal: db8500: Use of_match_ptr() macro in db8500_cpufreq_cooling.c	2013-01-04 15:40:03 +08:00
db8500_thermal.c	thermal: db8500: Fix missing mutex_unlock() in probe error paths	2013-03-26 22:08:08 +08:00
dove_thermal.c	thermal: dove: Fix thermal sensor formula	2013-03-26 22:13:10 +08:00
exynos_thermal.c	Thermal: exynos: remove unnecessary header inclusions	2013-04-12 07:24:19 +08:00
fair_share.c	Thermal: build thermal governors into thermal_sys module	2013-04-14 23:28:43 +08:00
intel_powerclamp.c	Fix mis-merge of intel_powerclamp.c resulting in compile error	2013-02-28 20:23:09 -08:00
Kconfig	Thermal: build cpu_cooling code into thermal_sys module	2013-04-14 23:28:49 +08:00
kirkwood_thermal.c	thermal: kirkwood: Fix thermal sensor formula	2013-03-26 22:12:20 +08:00
Makefile	Thermal: build cpu_cooling code into thermal_sys module	2013-04-14 23:28:49 +08:00
rcar_thermal.c	thermal: rcar: add pm_runtime_xxx() support	2013-04-02 21:18:39 +08:00
spear_thermal.c	drivers/thermal/spear_thermal.c: use devm_clk_get	2013-01-04 15:38:25 +08:00
step_wise.c	Thermal: build thermal governors into thermal_sys module	2013-04-14 23:28:43 +08:00
thermal_core.c	Thermal: build thermal governors into thermal_sys module	2013-04-14 23:28:43 +08:00
thermal_core.h	Thermal: build thermal governors into thermal_sys module	2013-04-14 23:28:43 +08:00
user_space.c	Thermal: build thermal governors into thermal_sys module	2013-04-14 23:28:43 +08:00