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)
commit8e5de3dcc6bde513d0e3940ae317b85972f3de5a
treedf51ff14164208dcde6ab196f5c86b193db6b81c
parent939de1d69c5fb0da0cfe05a1a7c981421cf876f7
parentbe6d2867b4f68a575c78fa368abd3ad49980c514
Merge branch 'pci/yinghai-root-bus-hotplug' into next

* 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()