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
..
olpc	Platform: OLPC: move global variables into priv struct	2012-07-31 23:27:31 -04:00
x86	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
Kconfig	Kconfig: Remove useless and sometimes wrong comments	2009-11-09 09:40:56 +01:00
Makefile	Platform: OLPC: add a stub to drivers/platform/ for the OLPC EC driver	2012-07-31 23:27:29 -04:00