Merge branch 'linus' into x86/irq

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

diff --cc arch/x86/kernel/entry_32.S
Simple merge

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