From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 29 Jul 2010 21:27:56 +0000 (+0100)
Subject: Merge branch 'arm/booting' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel... 
X-Git-Tag: v2.6.36-rc1~591^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a20df564d15bd28e3df24e1c65b885bd74d23f17;p=pandora-kernel.git

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

Conflicts:
	arch/arm/Kconfig
---

a20df564d15bd28e3df24e1c65b885bd74d23f17
Reading git-diff-tree failed