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

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

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

* Enable genmai board in multiplatform defconfig

* tag 'renesas-defconfig2-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Enable genmai board in multiplatform defconfig

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