tree 3ca1c6457e1c1ae4c11adab60e94d666841983aa
parent fb455792d91469fe556b68f1baa9ff5493432be8
parent 4f535093cf8f6da8cfda7c36c2c1ecd2e9586ee4
author Bjorn Helgaas <bhelgaas@google.com> 1359246958 -0700
committer Bjorn Helgaas <bhelgaas@google.com> 1359246958 -0700

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