Merge branch 'x86/core' into x86/build, to avoid conflicts
authorIngo Molnar <mingo@kernel.org>
Fri, 5 Oct 2018 09:27:23 +0000 (11:27 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 5 Oct 2018 09:27:23 +0000 (11:27 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge