Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-shmobile/include/mach/entry-macro-intc.S
Signed-off-by: NPaul Mundt <lethal@linux-sh.org>