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

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

Wed, 5 Jun 2013 22:58:46 +0000 (23:58 +0100)

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

Wed, 5 Jun 2013 22:58:46 +0000 (23:58 +0100)
author Russell King <rmk+kernel@arm.linux.org.uk>
Wed, 5 Jun 2013 22:58:46 +0000 (23:58 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Wed, 5 Jun 2013 22:58:46 +0000 (23:58 +0100)
diff --cc arch/arm/kernel/setup.c
Simple merge
diff --cc arch/arm/mm/nommu.c
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Wed, 5 Jun 2013 22:58:46 +0000 (23:58 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Wed, 5 Jun 2013 22:58:46 +0000 (23:58 +0100)
		1	2	3	4	5
arch/arm/kernel/setup.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/mm/nommu.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history