Fixed conflicts:

	arch/arm/Makefile
	arch/arm/mm/Kconfig
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>