Merge branch 'linus' into x86/cleanups

diff --cc arch/x86/kernel/io_apic_32.c
Simple merge

diff --cc arch/x86/kernel/pci-dma.c
Simple merge

diff --cc arch/x86/kernel/smpboot.c
Simple merge

diff --cc arch/x86/mm/init_64.c
Simple merge

diff --cc arch/x86/mm/srat_64.c
Simple merge

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