]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitebd75e8553f99670fef10845f7cb2fc5926c9f34
treedf2fc17a1dbd53122de2785868cf9fbaeecf2122
parentf6c134ea75d5418ce3f2aca5706c825fd02c0dea
parent89aeb722969d5284f7e893387677157853e1fdfb
Merge branch 'arm/booting' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel-stable

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