tree c400c9c06465f3c6888bbc91fe759c51056e5463
parent e84d0dedd324379bd784be748314b251334a79b6
parent b3e65e1f9185a2eb034defe4270ba178ba70b9a9
author Bjorn Helgaas <bhelgaas@google.com> 1357756636 -0700
committer Bjorn Helgaas <bhelgaas@google.com> 1357756636 -0700

Merge branch 'pci/yinghai-survey-resources' into next

* pci/yinghai-survey-resources:
  x86/PCI: Implement pcibios_resource_survey_bus()
  PCI/ACPI: Reserve firmware-allocated resources for hot-added root buses
  x86/PCI: Keep resource allocation functions after boot
  x86/PCI: Don't track firmware-assigned BAR values for hot-added devices
  x86/PCI: Factor out pcibios_allocate_dev_rom_resource()
  x86/PCI: Allocate resources on a per-bus basis for hot-adding root buses
  x86/PCI: Factor out pcibios_allocate_dev_resources()
  x86/PCI: Factor out pcibios_allocate_bridge_resources()