Conflicts:
	arch/x86/include/asm/io_apic.h

Merge reason: Resolve the conflict, update to a more recent -rc base
Signed-off-by: NIngo Molnar <mingo@elte.hu>