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)
commit78726ee5ff3fc76697c8754e0f546915bd61e7c6
tree3205c3066b632aade9bad9e1951586b065ac2192
parent1e423bff959e48166f5b7efca01fdb0dbdf05846
parenta1ff5726081858a9ad98934eff7af6616c576875
Merge branch 'x86/cpu' into x86/asm, to avoid conflict

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