Conflicts:
	arch/x86/kernel/genapic_64.c
	include/asm-x86/kvm_host.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>