Merge branch 'for_rmk' of git://git.linaro.org/kernel/linux-linaro-next into devel...

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

Mon, 4 Oct 2010 21:23:26 +0000 (22:23 +0100)

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

Mon, 4 Oct 2010 21:23:30 +0000 (22:23 +0100)
author Russell King <rmk+kernel@arm.linux.org.uk>
Mon, 4 Oct 2010 21:23:26 +0000 (22:23 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Mon, 4 Oct 2010 21:23:30 +0000 (22:23 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/Makefile
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Mon, 4 Oct 2010 21:23:26 +0000 (22:23 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Mon, 4 Oct 2010 21:23:30 +0000 (22:23 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history