Merge branch 'tip-x86-cpufeatures' into tip-master-merge

Conflicts:
	arch/x86/include/asm/disabled-features.h
	arch/x86/include/asm/required-features.h
	tools/arch/x86/include/asm/required-features.h

Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>