diff options
| author | Bjorn Helgaas | 2013-02-02 14:30:42 -0700 |
|---|---|---|
| committer | Bjorn Helgaas | 2013-02-02 14:30:42 -0700 |
| commit | 8e5de3dcc6bde513d0e3940ae317b85972f3de5a (patch) | |
| tree | df51ff14164208dcde6ab196f5c86b193db6b81c /drivers/pci/hotplug/cpqphp_ctrl.c | |
| parent | 939de1d69c5fb0da0cfe05a1a7c981421cf876f7 (diff) | |
| parent | be6d2867b4f68a575c78fa368abd3ad49980c514 (diff) | |
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()
Diffstat (limited to 'drivers/pci/hotplug/cpqphp_ctrl.c')
0 files changed, 0 insertions, 0 deletions