Merge branch 'x86/asm' into perf/x86, to avoid conflicts with upcoming patches
authorIngo Molnar <mingo@kernel.org>
Wed, 4 Feb 2015 08:01:12 +0000 (09:01 +0100)
committerIngo Molnar <mingo@kernel.org>
Wed, 4 Feb 2015 08:01:12 +0000 (09:01 +0100)
commit0967160ad615985c7c35443156ea9aecc60c37b8
tree658f728aff1be23540180091b718452a6848a6b0
parent2fde4f94e0a9531251e706fa57131b51b0df042e
parentb57c0b5175ddbe9b477801f9994a5b330702c1ba
Merge branch 'x86/asm' into perf/x86, to avoid conflicts with upcoming patches

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