From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 16 Apr 2013 16:37:22 +0000 (-0600)
Subject: Merge branch 'pci/jiang-subdrivers' into next
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a3b6bbd5774c13dab89d72f79976ba762913b2f2;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'pci/jiang-subdrivers' into next

* pci/jiang-subdrivers:
  PCI/ACPI: Remove support of ACPI PCI subdrivers
  PCI: acpiphp: Protect acpiphp data structures from concurrent updates
  PCI: acpiphp: Use normal list to simplify implementation
  PCI: acpiphp: Do not use ACPI PCI subdriver mechanism
  PCI: acpiphp: Convert acpiphp to be builtin only, not modular
  PCI/ACPI: Handle PCI slot devices when creating/destroying PCI buses
  x86/PCI: Implement pcibios_{add|remove}_bus() hooks
  ia64/PCI: Implement pcibios_{add|remove}_bus() hooks
  PCI/ACPI: Prepare stub functions to handle ACPI PCI (hotplug) slots
  PCI: Add pcibios hooks for adding and removing PCI buses
  PCI: acpiphp: Replace local macros with standard ACPI macros
  PCI: acpiphp: Remove all functions even if function 0 doesn't exist
  PCI: acpiphp: Use list_for_each_entry_safe() in acpiphp_sanitize_bus()
  PCI: Clean up usages of pci_bus->is_added
  PCI: When removing bus, always remove legacy files & unregister
---

a3b6bbd5774c13dab89d72f79976ba762913b2f2