From: Bjorn Helgaas <bhelgaas@google.com>
Date: Sat, 2 Feb 2013 21:30:42 +0000 (-0700)
Subject: Merge branch 'pci/yinghai-root-bus-hotplug' into next
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=8e5de3dcc6bde513d0e3940ae317b85972f3de5a;p=deliverable%2Flinux.git

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

8e5de3dcc6bde513d0e3940ae317b85972f3de5a