Merge branches 'pci/enumeration' and 'pci/virtualization' into next
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 23 Mar 2015 22:17:34 +0000 (17:17 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 23 Mar 2015 22:17:34 +0000 (17:17 -0500)
commit8e795840e4d89df3d594e736989212ee8a4a1fca
treee79ead8745159bf274489a8139a67d5d610d040e
parent85e8a0af374090e0bd89b781a1d3aa0eb4fcdfa0
parent9e808eb6a7689b61399f772a2576d779161769ec
parentd748804f5be8ca4dd97a4167fcf84867dca7c116
Merge branches 'pci/enumeration' and 'pci/virtualization' into next

* pci/enumeration:
  PCI: Cleanup control flow
  sparc/PCI: Claim bus resources before pci_bus_add_devices()
  PCI: Assign resources before drivers claim devices (pci_scan_root_bus())
  PCI: Assign resources before drivers claim devices (pci_scan_bus())

* pci/virtualization:
  PCI: Add ACS quirks for Intel 1G NICs
arch/s390/pci/pci.c
drivers/pci/host/pci-versatile.c
drivers/pci/probe.c