Merge branch 'x86/asm' into x86/apic, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Sun, 17 May 2015 05:58:08 +0000 (07:58 +0200)
committerIngo Molnar <mingo@kernel.org>
Sun, 17 May 2015 05:58:08 +0000 (07:58 +0200)
commitcffc32975da7df2ef909299c47ff644e1357e0ac
tree04cfa6276b890f49f686d65be7397c4232ac44af
parent6dc178760553605c58d78bd403dfcb4e042c5b72
parentadeb5537849d9db428fe0ddc3562e5a765a347e2
Merge branch 'x86/asm' into x86/apic, to resolve conflicts

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