From: Len Brown <len.brown@intel.com>
Date: Tue, 9 Oct 2012 05:35:52 +0000 (-0400)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux... 
X-Git-Tag: v3.7-rc1~12^2^3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29b19e250434c6193c8b8e4c34c9c6284dd4f101;p=pandora-kernel.git

Merge branch 'release' of git://git./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>
---

29b19e250434c6193c8b8e4c34c9c6284dd4f101
Reading git-diff-tree failed