Merge branch 'rmobile/core' into rmobile-fixes-for-linus

arch/arm/mach-shmobile/Kconfig

arch/arm/mach-shmobile/board-ap4evb.c

arch/arm/mach-shmobile/clock-sh7372.c

arch/arm/mach-shmobile/include/mach/gpio.h

arch/arm/mach-shmobile/include/mach/sh7372.h

drivers/clocksource/sh_cmt.c

drivers/clocksource/sh_mtu2.c

drivers/clocksource/sh_tmu.c

include/linux/mmc/sh_mmcif.h

include/linux/sh_timer.h