From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 11 Apr 2017 08:47:28 +0000 (+0200)
Subject: Merge branch 'x86/urgent' into x86/cpu, to resolve conflict
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b6466d53afdb0c3ca058848cd4c12e141aba0763;p=linux.git

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>
---

b6466d53afdb0c3ca058848cd4c12e141aba0763