Conflicts:

	arch/x86/kernel/i8259.c
	arch/x86/kernel/irqinit_64.c
Signed-off-by: NIngo Molnar <mingo@elte.hu>