diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-09 10:00:02 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-09 10:00:02 -0700 |
| commit | fa20f6f240e127bc914ca980a4b10c723c55fec9 (patch) | |
| tree | 1a8267f53240b763a9d555a410341c3d7e432721 /drivers/pci/pci.c | |
| parent | 13a84687092f47a6d67b1b17940eb3127ae888b3 (diff) | |
| parent | f426cef3bc58806284e0fee55d29262b10279f9c (diff) | |
Merge branch 'pci/yinghai-for-pci-root-bus-hotplug' into next
* pci/yinghai-for-pci-root-bus-hotplug:
PCI/ACPI: Remove acpi_root_driver in reverse order
PCI/ACPI: Delete host bridge _PRT during hot remove path
PCI/ACPI: Make acpi_pci_root_remove() stop/remove pci root bus
PCI: Add pci_stop_and_remove_root_bus()
PCI/ACPI: Assign unassigned resource for hot-added root bus
PCI: Move out pci_enable_bridges out of assign_unsigned_bus_res
PCI: Move pci_rescan_bus() back to probe.c
PCI: Separate out pci_assign_unassigned_bus_resources()
Diffstat (limited to 'drivers/pci/pci.c')
0 files changed, 0 insertions, 0 deletions