Merge branch 'arm/common-kconfig-refactor+for-rmk' of git://git.linaro.org/people...

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

Mon, 19 Dec 2011 21:54:35 +0000 (21:54 +0000)

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

Mon, 19 Dec 2011 21:54:35 +0000 (21:54 +0000)
author Russell King <rmk+kernel@arm.linux.org.uk>
Mon, 19 Dec 2011 21:54:35 +0000 (21:54 +0000)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Mon, 19 Dec 2011 21:54:35 +0000 (21:54 +0000)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/mach-imx/Kconfig
Simple merge
diff --cc arch/arm/mach-omap2/Kconfig
Simple merge
diff --cc arch/arm/mm/Kconfig
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Mon, 19 Dec 2011 21:54:35 +0000 (21:54 +0000)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Mon, 19 Dec 2011 21:54:35 +0000 (21:54 +0000)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history