Merge branch 'tmpreg' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 25 Feb 2010 22:07:25 +0000 (22:07 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 25 Feb 2010 22:07:25 +0000 (22:07 +0000)
commit186f93ea1f274f4cde4a356401c1786c818ff881
treede28f076c823d5423a5b4780f0d37554c242c982
parent3560adf62075829393743667ff338dd8fd26a5c2
parent4e6d488af37980d224cbf298224db6173673f362
Merge branch 'tmpreg' into devel

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