Merge tag 'renesas-defconfig4-for-v3.17' of...

Merge tag 'renesas-defconfig4-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig

Merge "Fourth Round of Renesas ARM Based SoC Defconfig Updates for v3.17" from
Simon Horman:

The genmai board code is going away so remove:
 - The genmai defconfig
 - MACH_GENMAI from shmobile defconfig

* tag 'renesas-defconfig4-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: defconfig: Remove MACH_GENMAI
  ARM: shmobile: genmai: remove defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>