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
This commit is contained in:
Bjorn Helgaas 2014-05-30 11:40:13 -06:00
commit d785260e2f
5 changed files with 504 additions and 0 deletions