From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 23 Mar 2015 22:17:34 +0000 (-0500)
Subject: Merge branches 'pci/enumeration' and 'pci/virtualization' into next
X-Git-Tag: firefly_0821_release~176^2~2005^2~2
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=8e795840e4d89df3d594e736989212ee8a4a1fca;p=firefly-linux-kernel-4.4.55.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