Merge tag 'renesas-maintainers-for-v3.18' of...

Merge tag 'renesas-maintainers-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/fixes-non-critical

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

* Remove genmai_defconfig from MAINTAINERS
  genmai_defconfig was removed in v3.17-rc1.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

* tag 'renesas-maintainers-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Remove genmai_defconfig from MAINTAINERS

MAINTAINERS

@@ -1355,7 +1355,6 @@ F:	arch/arm/boot/dts/sh*
 F:	arch/arm/configs/ape6evm_defconfig
 F:	arch/arm/configs/armadillo800eva_defconfig
 F:	arch/arm/configs/bockw_defconfig
-F:	arch/arm/configs/genmai_defconfig
 F:	arch/arm/configs/koelsch_defconfig
 F:	arch/arm/configs/kzm9g_defconfig
 F:	arch/arm/configs/lager_defconfig