Conflicts:
	arch/arm/mach-shmobile/Kconfig
	arch/arm/mach-shmobile/Makefile
Signed-off-by: NPaul Mundt <lethal@linux-sh.org>