Merge branch 'for_3.14/arm-no-bootmem' of git://git.kernel.org/pub/scm/linux/kernel...

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

Mon, 13 Jan 2014 23:36:45 +0000 (23:36 +0000)

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

Mon, 13 Jan 2014 23:36:45 +0000 (23:36 +0000)
author Russell King <rmk+kernel@arm.linux.org.uk>
Mon, 13 Jan 2014 23:36:45 +0000 (23:36 +0000)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Mon, 13 Jan 2014 23:36:45 +0000 (23:36 +0000)
diff --cc arch/arm/kernel/setup.c
Simple merge
diff --cc arch/arm/mm/init.c
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Mon, 13 Jan 2014 23:36:45 +0000 (23:36 +0000)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Mon, 13 Jan 2014 23:36:45 +0000 (23:36 +0000)
		1	2
arch/arm/kernel/setup.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/init.c	patch \|	diff1 \|	diff2 \|	blob \| history