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)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge