Conflicts:

	arch/x86/Kconfig.cpu
	arch/x86/kernel/cpu/intel.c
	arch/x86/kernel/setup_64.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>