commit | ff8a19c2e6fff95ace32f2ae536c38493ef9cad1 | [log] [tgz] |
---|---|---|
author | Olof Johansson <olof@lixom.net> | Sat Jul 12 21:47:52 2014 -0700 |
committer | Olof Johansson <olof@lixom.net> | Sat Jul 12 21:47:52 2014 -0700 |
tree | 628f4dbfce87a3b92b07065f3647d9b8cf1c7a45 | |
parent | 109528b2be2c0c893dcb07abdb34a1f01f6ad665 [diff] | |
parent | 8cbf869a0a278c4d39e50daa4f4101b394a72a93 [diff] |
Merge tag 'renesas-defconfig3-for-v3.17' of git://git.kernel.org/pub/scm/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>