]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit5a58a912919e706ab5f66196261e7b715fc1cc00
treee79ead8745159bf274489a8139a67d5d610d040e
parent4107a6ef0720154b2df6c9d6b962154efe4d21f0
parentcb3aaff310bb9ef24b668b0fdbc4b0531f13c34f
parentd81e134c4af866339893d51f30317cc38c97eb98
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