Merge branch 'x86/cpu' into x86/asm, to avoid conflict
authorIngo Molnar <mingo@kernel.org>
Sat, 30 Jan 2016 10:21:40 +0000 (11:21 +0100)
committerIngo Molnar <mingo@kernel.org>
Sat, 30 Jan 2016 10:21:40 +0000 (11:21 +0100)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge