Conflicts:
	arch/x86/mach-default/setup.c

Semantic merge:
	arch/x86/kernel/irqinit_32.c
Signed-off-by: NIngo Molnar <mingo@elte.hu>