diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-01-27 01:35:58 +0100 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-01-27 01:35:58 +0100 |
| commit | 939de1d69c5fb0da0cfe05a1a7c981421cf876f7 (patch) | |
| tree | 3ca1c6457e1c1ae4c11adab60e94d666841983aa /drivers/sbus/char | |
| parent | Merge branch 'pci/acpi-scan2' into next (diff) | |
| parent | PCI: Put pci_dev in device tree as early as possible (diff) | |
| download | linux-939de1d69c5fb0da0cfe05a1a7c981421cf876f7.tar.xz linux-939de1d69c5fb0da0cfe05a1a7c981421cf876f7.zip | |
Merge branch 'pci/yinghai-root-bus-hotplug' into next
* pci/yinghai-root-bus-hotplug:
PCI: Put pci_dev in device tree as early as possible
PCI: Skip attaching driver in device_add()
PCI: acpiphp: Keep driver loaded even if no slots found
PCI/ACPI: Print info if host bridge notify handler installation fails
PCI: acpiphp: Move host bridge hotplug to pci_root.c
PCI/ACPI: acpiphp: Rename alloc_acpiphp_hp_work() to alloc_acpi_hp_work()
PCI: Make device create/destroy logic symmetric
PCI: Fix reference count leak in pci_dev_present()
PCI: Set pci_dev dev_node early so IOAPIC irq_descs are allocated locally
PCI: Add root bus children dev's res to fail list
PCI: acpiphp: Add is_hotplug_bridge detection
Conflicts:
drivers/pci/pci.h
Diffstat (limited to 'drivers/sbus/char')
0 files changed, 0 insertions, 0 deletions