From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 25 Feb 2010 22:07:25 +0000 (+0000)
Subject: Merge branch 'tmpreg' into devel
X-Git-Tag: v2.6.34-rc1~241^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=186f93ea1f274f4cde4a356401c1786c818ff881;p=pandora-kernel.git

Merge branch 'tmpreg' into devel

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-ux500/include/mach/debug-macro.S
---

186f93ea1f274f4cde4a356401c1786c818ff881
Reading git-diff-tree failed