Merge remote-tracking branch 'pci/next'

Conflicts:
	arch/ia64/pci/pci.c

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/frv/mb93090-mb00/pci-vdk.c
Simple merge

diff --cc arch/ia64/pci/pci.c
index 55b72ad573292d58af2d6eff037a46bab8d75dba,00e59c7ad3c057cd68c191b569d7f63b61815125..60532ab2734684eafc036e5a5bc88194b7bae142
--- 1/arch/ia64/pci/pci.c
--- 2/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@@ -393,7 -396,15 +393,15 @@@ out1
        return NULL;
  }
  
 -static int __devinit is_valid_resource(struct pci_dev *dev, int idx)
+ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
+ {
+       struct pci_controller *controller = bridge->bus->sysdata;
+ 
+       ACPI_HANDLE_SET(&bridge->dev, controller->acpi_handle);
+       return 0;
+ }
+ 
 +static int is_valid_resource(struct pci_dev *dev, int idx)
  {
        unsigned int i, type_mask = IORESOURCE_IO | IORESOURCE_MEM;
        struct resource *devr = &dev->resource[idx], *busr;

diff --cc arch/mn10300/unit-asb2305/pci.c
Simple merge

diff --cc arch/x86/include/asm/pci_x86.h
Simple merge

diff --cc arch/x86/pci/acpi.c
Simple merge

diff --cc arch/x86/pci/common.c
Simple merge

diff --cc arch/x86/pci/legacy.c
Simple merge

diff --cc arch/x86/pci/numaq_32.c
Simple merge

diff --cc drivers/acpi/acpi_memhotplug.c
Simple merge

diff --cc drivers/acpi/device_pm.c
Simple merge

diff --cc drivers/acpi/glue.c
Simple merge

diff --cc drivers/acpi/osl.c
Simple merge

diff --cc drivers/acpi/scan.c
Simple merge

diff --cc drivers/pci/hotplug/pciehp_core.c
Simple merge

diff --cc drivers/pci/iov.c
Simple merge

diff --cc drivers/pci/pcie/aspm.c
Simple merge

diff --cc drivers/pci/remove.c
Simple merge