tree 71ef007260a1584f4f48d7a7118a3157d01eb5f7
parent 7d8c4a2c5ae6d76f1142fb052d698b3c40ce518c
parent 39772038ea93e85ea4f1307ec9c1f48a063d89a0
author Bjorn Helgaas <bhelgaas@google.com> 1377553203 -0600
committer Bjorn Helgaas <bhelgaas@google.com> 1377553203 -0600

Merge branch 'pci/yinghai-assign-unassigned-v6' into next

* pci/yinghai-assign-unassigned-v6:
  PCI: Assign resources for hot-added host bridge more aggressively
  PCI: Move resource reallocation code to non-__init
  PCI: Delay enabling bridges until they're needed
  PCI: Assign resources on a per-bus basis
  PCI: Enable unassigned resource reallocation on per-bus basis
  PCI: Turn on reallocation for unassigned resources with host bridge offset
  PCI: Look for unassigned resources on per-bus basis
  PCI: Drop temporary variable in pci_assign_unassigned_resources()