Merge branch 'pci/yinghai-root-bus-hotplug' into next
authorBjorn Helgaas <bhelgaas@google.com>
Sat, 2 Feb 2013 21:30:42 +0000 (14:30 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Sat, 2 Feb 2013 21:30:42 +0000 (14:30 -0700)
* pci/yinghai-root-bus-hotplug:
  PCI: acpiphp: Remove dead code for PCI host bridge hotplug
  PCI: acpiphp: Create companion ACPI devices before creating PCI devices
  PCI: Remove unused "rc" in virtfn_add_bus()


Trivial merge