Merge tag 'renesas-pci-defconfig-for-v4.7' of git://git.kernel.org/pub/scm/linux...

Merge "Renesas ARM Based SoC Pci Defconfig Updates for v4.7" from Simon Horman:

* Remove Gen2 designation from Kconfig for R-Car PCIE driver

* tag 'renesas-pci-defconfig-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  PCI: rcar-pcie: Remove Gen2 designation from Kconfig

diff --cc arch/arm/configs/multi_v7_defconfig
Simple merge

diff --cc arch/arm/configs/shmobile_defconfig
Simple merge

diff --cc arch/arm64/configs/defconfig
Simple merge