Merge branch 'arm/booting' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel-stable

Conflicts:
	arch/arm/Kconfig
This commit is contained in:
Russell King 2010-07-29 22:27:56 +01:00
commit a20df564d1
10 changed files with 152 additions and 79 deletions