Merge branch 'pci/host-generic' into next

* pci/host-generic:
  MAINTAINERS: Add generic PCI host controller driver
  PCI: generic: Add generic PCI host controller driver

Conflicts:
	drivers/pci/host/Kconfig
	drivers/pci/host/Makefile

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/pci/host/Kconfig
index 24d290d,32d446e..21df477
--- 1/drivers/pci/host/Kconfig
--- 2/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@@ -33,10 -33,11 +33,17 @@@ config PCI_RCAR_GEN
          There are 3 internal PCI controllers available with a single
          built-in EHCI/OHCI host controller present on each one.
  
 +config PCI_RCAR_GEN2_PCIE
 +      bool "Renesas R-Car PCIe controller"
 +      depends on ARCH_SHMOBILE || (ARM && COMPILE_TEST)
 +      help
 +        Say Y here if you want PCIe controller support on R-Car Gen2 SoCs.
 +
+ config PCI_HOST_GENERIC
+       bool "Generic PCI host controller"
+       depends on ARM && OF
+       help
+         Say Y here if you want to support a simple generic PCI host
+         controller, such as the one emulated by kvmtool.
+ 
  endmenu

diff --cc drivers/pci/host/Makefile
index 19946f9,bd1bf1a..611ba4b
--- 1/drivers/pci/host/Makefile
--- 2/drivers/pci/host/Makefile
+++ b/drivers/pci/host/Makefile
@@@ -4,4 -4,4 +4,5 @@@ obj-$(CONFIG_PCI_IMX6) += pci-imx6.
  obj-$(CONFIG_PCI_MVEBU) += pci-mvebu.o
  obj-$(CONFIG_PCI_TEGRA) += pci-tegra.o
  obj-$(CONFIG_PCI_RCAR_GEN2) += pci-rcar-gen2.o
 +obj-$(CONFIG_PCI_RCAR_GEN2_PCIE) += pcie-rcar.o
+ obj-$(CONFIG_PCI_HOST_GENERIC) += pci-host-generic.o