commit 6b6c4a854a3790c5ab760d6129680e97f09fa1b1
author Olof Johansson <olof@lixom.net> Wed Jan 21 14:45:04 2015 -0800
committer Olof Johansson <olof@lixom.net> Wed Jan 21 14:45:04 2015 -0800
tree 066afc4b8cb577e28b78a592cb87f794a7ca3ad5
parent 93f2242b8dd32a9908bbead341f22d419d7d9dba
parent eb4513482d1c4882e3633528ccc48d77581b7bb1

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

Second Round of Renesas ARM Based SoC Defconfig Updates for v3.20

* Enable kzm9g board in multiplatform defconfig

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

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