Merge tag 'renesas-pci-defconfig-for-v4.7' of git://git.kernel.org/pub/scm/linux...
authorArnd Bergmann <arnd@arndb.de>
Tue, 26 Apr 2016 11:11:15 +0000 (13:11 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 26 Apr 2016 11:11:15 +0000 (13:11 +0200)
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

1  2 
arch/arm/configs/multi_v7_defconfig
arch/arm/configs/shmobile_defconfig
arch/arm64/configs/defconfig

Simple merge
Simple merge
Simple merge