diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2015-03-23 23:17:34 +0100 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2015-03-23 23:17:34 +0100 |
| commit | 8e795840e4d89df3d594e736989212ee8a4a1fca (patch) | |
| tree | e79ead8745159bf274489a8139a67d5d610d040e /arch/m68k | |
| parent | Merge branches 'pci/iommu' and 'pci/resource' into next (diff) | |
| parent | PCI: Cleanup control flow (diff) | |
| parent | PCI: Add ACS quirks for Intel 1G NICs (diff) | |
| download | linux-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