From: Bjorn Helgaas <bhelgaas@google.com>
Date: Sun, 27 Jan 2013 00:35:58 +0000 (-0700)
Subject: Merge branch 'pci/yinghai-root-bus-hotplug' into next
X-Git-Tag: v3.9-rc1~82^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=939de1d69c5fb0da0cfe05a1a7c981421cf876f7;p=pandora-kernel.git

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

939de1d69c5fb0da0cfe05a1a7c981421cf876f7
Reading git-diff-tree failed