Merge branch 'x86/unify-pci' into x86/core

arch/mips/mm/c-r3k.c

arch/mips/mm/page.c

arch/mips/mm/sc-rm7k.c

arch/powerpc/kernel/legacy_serial.c

arch/um/Makefile

arch/um/Makefile-i386

arch/um/Makefile-x86_64

arch/x86/pci/Makefile

arch/x86/pci/Makefile_32

arch/x86/pci/Makefile_64

arch/x86/pci/acpi.c

arch/x86/pci/amd_bus.c

arch/x86/pci/common.c

arch/x86/pci/init.c

arch/x86/pci/irq.c

arch/x86/pci/legacy.c

arch/x86/pci/mp_bus_to_node.c

arch/x86/pci/numa.c

arch/x86/pci/pci.h

arch/x86/pci/visws.c