Merge branch 'x86/urgent' into x86/cpu, to resolve conflict
authorIngo Molnar <mingo@kernel.org>
Tue, 11 Apr 2017 08:47:28 +0000 (10:47 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 11 Apr 2017 08:47:28 +0000 (10:47 +0200)
Conflicts:
arch/x86/kernel/cpu/intel_rdt_schemata.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
arch/x86/kernel/cpu/intel_rdt_rdtgroup.c