Merge branch 'x86/irq' into x86/devel

Conflicts:

	arch/x86/kernel/i8259.c
	arch/x86/kernel/irqinit_64.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc arch/x86/kernel/apic_32.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/irq_32.c
Simple merge