commit | 186f93ea1f274f4cde4a356401c1786c818ff881 | [log] [tgz] |
---|---|---|
author | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Feb 25 22:07:25 2010 +0000 |
committer | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Feb 25 22:07:25 2010 +0000 |
tree | de28f076c823d5423a5b4780f0d37554c242c982 | |
parent | 3560adf62075829393743667ff338dd8fd26a5c2 [diff] | |
parent | 4e6d488af37980d224cbf298224db6173673f362 [diff] |
Merge branch 'tmpreg' into devel Conflicts: arch/arm/Kconfig arch/arm/mach-ux500/include/mach/debug-macro.S