Merge branch 'devicetree/arm-next' of git://git.secretlab.ca/git/linux-2.6 into devel...

author Russell King <rmk+kernel@arm.linux.org.uk>

Tue, 24 May 2011 23:08:17 +0000 (00:08 +0100)

committer Russell King <rmk+kernel@arm.linux.org.uk>

Tue, 24 May 2011 23:08:17 +0000 (00:08 +0100)
author Russell King <rmk+kernel@arm.linux.org.uk>
Tue, 24 May 2011 23:08:17 +0000 (00:08 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Tue, 24 May 2011 23:08:17 +0000 (00:08 +0100)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/kernel/setup.c
Simple merge
diff --cc arch/arm/mm/init.c
Simple merge
diff --cc arch/powerpc/kernel/prom.c
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Tue, 24 May 2011 23:08:17 +0000 (00:08 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Tue, 24 May 2011 23:08:17 +0000 (00:08 +0100)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/setup.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/init.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/prom.c	patch \|	diff1 \|	diff2 \|	blob \| history