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)
commita20df564d15bd28e3df24e1c65b885bd74d23f17
treedf2fc17a1dbd53122de2785868cf9fbaeecf2122
parentd50f58bbd979e86378dfdec982452041f0e604ef
parente69edc7939abda1f696c482faa8168d80420f75c
Merge branch 'arm/booting' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel-stable

Conflicts:
arch/arm/Kconfig
arch/arm/Kconfig