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>

2012-10-09 01:35:52 -04:00

..

cpu_cooling.c

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux into thermal

2012-10-09 01:35:52 -04:00

exynos_thermal.c

thermal: Exynos: Fix NULL pointer dereference in exynos_unregister_thermal()

2012-09-28 08:23:21 +08:00

Kconfig

thermal: exynos5: add exynos5250 thermal sensor driver support

2012-09-24 14:44:38 +08:00

Makefile

hwmon: exynos4: move thermal sensor driver to driver/thermal directory

2012-09-24 14:44:38 +08:00

rcar_thermal.c

thermal: add Renesas R-Car thermal sensor support

2012-09-24 14:44:37 +08:00

spear_thermal.c

Thermal: Remove tc1/tc2 in generic thermal layer.

2012-09-24 14:44:36 +08:00

thermal_sys.c

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux into thermal

2012-10-09 01:35:52 -04:00