Conflicts:

	include/asm-x86/i8259.h
	include/asm-x86/msidef.h
Signed-off-by: NIngo Molnar <mingo@elte.hu>