Merge tag 'renesas-cleanup-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel...

Merge "Renesas ARM Based SoC Cleanup Updates for v3.18" from Simon Horman:

* Remove Genmai board code

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'renesas-cleanup-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r7s72100: Remove legacy board support
  ARM: shmobile: r7s72100: genmai: Remove legacy board file
  ARM: shmobile: r7s72100: genmai: Remove reference board file

diff --cc arch/arm/mach-shmobile/Makefile
Simple merge

diff --cc arch/arm/mach-shmobile/setup-r7s72100.c
index 46a93f73ee4a6e4c6bf0753e99bf146c299f7192,111437df8eb64728a0c7d10bd1ba733de3dda65d..4122104359f98d909ae03a923256b479972ff3e0
--- 1/arch/arm/mach-shmobile/setup-r7s72100.c
--- 2/arch/arm/mach-shmobile/setup-r7s72100.c
+++ b/arch/arm/mach-shmobile/setup-r7s72100.c
@@@ -32,7 -31,5 +31,6 @@@ static const char *r7s72100_boards_comp
  
  DT_MACHINE_START(R7S72100_DT, "Generic R7S72100 (Flattened Device Tree)")
        .init_early     = shmobile_init_delay,
 +      .init_late      = shmobile_init_late,
        .dt_compat      = r7s72100_boards_compat_dt,
  MACHINE_END
- #endif /* CONFIG_USE_OF */