Merge branch 'pci/misc' into next

* pci/misc:
  PCI: Enable INTx if BIOS left them disabled
  ia64/PCI: Set IORESOURCE_ROM_SHADOW only for the default VGA device
  x86/PCI: Set IORESOURCE_ROM_SHADOW only for the default VGA device
  PCI: Update outdated comment for pcibios_bus_report_status()
  PCI: Cleanup per-arch list of object files
  PCI: cpqphp: Fix hex vs decimal typo in cpqhpc_probe()
  x86/PCI: Fix function definition whitespace
  x86/PCI: Reword comments
  x86/PCI: Remove unnecessary local variable initialization
  PCI: Remove unnecessary list_empty(&pci_pme_list) check

diff --cc arch/arm/kernel/bios32.c
Simple merge

diff --cc arch/x86/pci/acpi.c
index f44a64c74e3719ace49ceab0494c80eac2383aa1,b0bc5920f5c677247b737eaa8f84df57fb7a80e3..01edac6c5e1867c489b8e99dab52761dcd5b849a
--- 1/arch/x86/pci/acpi.c
--- 2/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@@ -477,9 -474,12 +474,9 @@@ struct pci_bus *pci_acpi_scan_root(stru
        int domain = root->segment;
        int busnum = root->secondary.start;
        LIST_HEAD(resources);
-       struct pci_bus *bus = NULL;
+       struct pci_bus *bus;
        struct pci_sysdata *sd;
        int node;
 -#ifdef CONFIG_ACPI_NUMA
 -      int pxm;
 -#endif
  
        if (pci_ignore_seg)
                domain = 0;

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

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