commit ecc5d5d286188c71b12091a656b842e6bea3564c
author Olof Johansson <olof@lixom.net> Wed Sep 24 11:16:40 2014 -0700
committer Olof Johansson <olof@lixom.net> Wed Sep 24 11:16:56 2014 -0700
tree af864580765af7fae46b3c14179486836f3db818
parent 2d9251e3501356ceb44444a8f9a393b57163dc6a
parent 7d984c95723725d26f3961c1655c20256f0affdf

Merge tag 'renesas-defconfig4-for-v3.18' 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.18" from Simon Horman:

Fourth Round of Renesas ARM Based SoC Defconfig Updates for v3.18

* Enable r8a7794 SoC in shmobile_defconfig

* tag 'renesas-defconfig4-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Enable r8a7794 SoC in shmobile_defconfig

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