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

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

Sun, 3 Mar 2013 00:32:50 +0000 (00:32 +0000)

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

Sun, 3 Mar 2013 00:32:50 +0000 (00:32 +0000)
author Russell King <rmk+kernel@arm.linux.org.uk>
Sun, 3 Mar 2013 00:32:50 +0000 (00:32 +0000)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Sun, 3 Mar 2013 00:32:50 +0000 (00:32 +0000)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/include/asm/pgtable.h
Simple merge
diff --cc arch/arm/kernel/smp.c
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Sun, 3 Mar 2013 00:32:50 +0000 (00:32 +0000)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Sun, 3 Mar 2013 00:32:50 +0000 (00:32 +0000)
		1	2	3
MAINTAINERS	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/arm/include/asm/pgtable.h	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/arm/kernel/smp.c	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history