Merge branches 'devel-stable', 'fixes' and 'mmci' into for-next

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

Mon, 18 Feb 2013 22:05:31 +0000 (22:05 +0000)

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

Mon, 18 Feb 2013 22:05:31 +0000 (22:05 +0000)
author Russell King <rmk+kernel@arm.linux.org.uk>
Mon, 18 Feb 2013 22:05:31 +0000 (22:05 +0000)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Mon, 18 Feb 2013 22:05:31 +0000 (22:05 +0000)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/kernel/smp.c
Simple merge
diff --cc arch/arm/mm/mmu.c
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Mon, 18 Feb 2013 22:05:31 +0000 (22:05 +0000)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Mon, 18 Feb 2013 22:05:31 +0000 (22:05 +0000)
		1	2	3	4
MAINTAINERS	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/arm/kernel/smp.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/arm/mm/mmu.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history