Conflicts:
	arch/x86/kernel/process_64.c

Semantic conflict fixed in:
	arch/x86/kvm/x86.c
Signed-off-by: NIngo Molnar <mingo@elte.hu>