Merge remote-tracking branch 'arm-lpae/for-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 29 Sep 2011 23:58:32 +0000 (09:58 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 29 Sep 2011 23:58:32 +0000 (09:58 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Sep 2011 23:58:32 +0000 (09:58 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Sep 2011 23:58:32 +0000 (09:58 +1000)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/include/asm/system.h
Simple merge
diff --cc arch/arm/kernel/head.S
Simple merge
diff --cc arch/arm/kernel/setup.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 29 Sep 2011 23:58:32 +0000 (09:58 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 29 Sep 2011 23:58:32 +0000 (09:58 +1000)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/system.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/head.S	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/setup.c	patch \|	diff1 \|	diff2 \|	blob \| history