Merge branch 'devicetree/arm-next' of git://git.secretlab.ca/git/linux-2.6 into devel...
Russell King [Tue, 24 May 2011 23:08:17 +0000 (00:08 +0100)]
1  2 
arch/arm/Kconfig
arch/arm/kernel/setup.c
arch/arm/mm/init.c
arch/powerpc/kernel/prom.c

Simple merge
Simple merge
Simple merge
Simple merge