Merge branch 'arm/booting' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 29 Jul 2010 21:27:56 +0000 (22:27 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 29 Jul 2010 21:27:56 +0000 (22:27 +0100)
Conflicts:
arch/arm/Kconfig


Trivial merge