Merge branch 'linus' into x86/x2apic

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

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/Makefile
Simple merge

diff --cc arch/x86/kernel/acpi/boot.c
Simple merge

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

diff --cc arch/x86/kernel/cpu/common_64.c
Simple merge

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

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

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

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

diff --cc arch/x86/xen/enlighten.c
Simple merge

diff --cc drivers/pci/Makefile
Simple merge

diff --cc include/asm-x86/genapic_64.h
Simple merge

diff --cc include/asm-x86/hw_irq.h
Simple merge

diff --cc include/asm-x86/smp.h
Simple merge

diff --cc include/linux/irq.h
Simple merge

diff --cc kernel/irq/manage.c
Simple merge