Merge tag 'renesas-defconfig3-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Sun, 13 Jul 2014 04:47:52 +0000 (21:47 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 13 Jul 2014 04:47:52 +0000 (21:47 -0700)
commitff8a19c2e6fff95ace32f2ae536c38493ef9cad1
tree628f4dbfce87a3b92b07065f3647d9b8cf1c7a45
parent109528b2be2c0c893dcb07abdb34a1f01f6ad665
parent8cbf869a0a278c4d39e50daa4f4101b394a72a93
Merge tag 'renesas-defconfig3-for-v3.17' of git://git./linux/kernel/git/horms/renesas into next/defconfig

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

- Enable R-Car Gen 2 PCIe in shmobile_defconfig

* tag 'renesas-defconfig3-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Enable R-Car Gen 2 PCIe in shmobile_defconfig

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