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

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>