summaryrefslogtreecommitdiffstats
path: root/arch/x86/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2015-03-23 23:17:34 +0100
committerBjorn Helgaas <bhelgaas@google.com>2015-03-23 23:17:34 +0100
commit8e795840e4d89df3d594e736989212ee8a4a1fca (patch)
treee79ead8745159bf274489a8139a67d5d610d040e /arch/x86/pci
parentMerge branches 'pci/iommu' and 'pci/resource' into next (diff)
parentPCI: Cleanup control flow (diff)
parentPCI: Add ACS quirks for Intel 1G NICs (diff)
downloadlinux-8e795840e4d89df3d594e736989212ee8a4a1fca.tar.xz
linux-8e795840e4d89df3d594e736989212ee8a4a1fca.zip
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