Merge branch 'x86/urgent' into x86/cpu, to resolve conflict

Conflicts:
	arch/x86/kernel/cpu/intel_rdt_schemata.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
Simple merge