Merge branch 'pci/yinghai-root-bus-hotplug' into next
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 19 Feb 2013 18:42:17 +0000 (11:42 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 19 Feb 2013 18:42:17 +0000 (11:42 -0700)
commit018ba0a6efada61b9bc17500101d81c3d35807c2
tree13361ad9197c5021841a0ccf0bfb1dabfd6d424e
parentfd5e20bcb465e8d69a6fda617a7b35fb5f8d4eb1
parent181380b702eee1a9aca51354d7b87c7b08541fcf
Merge branch 'pci/yinghai-root-bus-hotplug' into next

* pci/yinghai-root-bus-hotplug:
  PCI/ACPI: Don't cache _PRT, and don't associate them with bus numbers
drivers/acpi/pci_root.c
drivers/pci/pci-acpi.c