Files
android_kernel_xiaomi_sm8450/include/linux/platform_data
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
..
2012-09-17 20:55:54 +01:00
2012-06-30 10:15:07 +01:00
2012-09-08 10:20:09 +01:00
2012-07-11 15:36:45 -07:00
2012-05-18 00:00:45 +02:00
2012-05-22 06:48:02 -07:00
2012-09-23 21:08:33 -07:00
2012-08-16 12:12:25 -07:00
2012-06-13 13:13:37 +01:00
2012-07-02 04:05:57 -07:00
2012-09-05 13:21:46 -07:00
2012-09-18 12:28:22 +02:00