Merge branches 'devel', 'devel-stable' and 'fixes' into for-linus

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

Fri, 27 May 2011 21:59:57 +0000 (22:59 +0100)

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

Fri, 27 May 2011 21:59:57 +0000 (22:59 +0100)
author Russell King <rmk+kernel@arm.linux.org.uk>
Fri, 27 May 2011 21:59:57 +0000 (22:59 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Fri, 27 May 2011 21:59:57 +0000 (22:59 +0100)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/kernel/Makefile
Simple merge
diff --cc arch/arm/kernel/head.S
Simple merge
diff --cc arch/arm/mm/init.c
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Fri, 27 May 2011 21:59:57 +0000 (22:59 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Fri, 27 May 2011 21:59:57 +0000 (22:59 +0100)
		1	2	3
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/arm/kernel/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/arm/kernel/head.S	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/arm/mm/init.c	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history