From: Bjorn Helgaas Date: Mon, 23 Mar 2015 22:17:34 +0000 (-0500) Subject: Merge branches 'pci/enumeration' and 'pci/virtualization' into next X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8e795840e4d89df3d594e736989212ee8a4a1fca;p=linux-beck.git 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 --- 8e795840e4d89df3d594e736989212ee8a4a1fca