You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Len Brown 29b19e2504 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux into thermal ... Conflicts: drivers/staging/omap-thermal/omap-thermal-common. OMAP supplied dummy TC1 and TC2, at the same time that the thermal tree removed them from thermal_zone_device_register() drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c propogate the upstream MAX_IDR_LEVEL re-name to prevent a build failure Previously-fixed-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Len Brown <len.brown@intel.com>		13 years ago
..
Kconfig	thermal: exynos5: add exynos5250 thermal sensor driver support	13 years ago
Makefile	hwmon: exynos4: move thermal sensor driver to driver/thermal directory	13 years ago
cpu_cooling.c	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux into thermal	13 years ago
exynos_thermal.c	thermal: Exynos: Fix NULL pointer dereference in exynos_unregister_thermal()	13 years ago
rcar_thermal.c	thermal: add Renesas R-Car thermal sensor support	13 years ago
spear_thermal.c	Thermal: Remove tc1/tc2 in generic thermal layer.	13 years ago
thermal_sys.c	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux into thermal	13 years ago