Merge branch 'linus' into x86/asm, before applying dependent patch
authorIngo Molnar <mingo@kernel.org>
Fri, 8 May 2015 11:33:33 +0000 (13:33 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 8 May 2015 11:33:33 +0000 (13:33 +0200)
commit7ae383be81781c5e1347f71c3eb0d53ce5188200
treed2dfedb78cf4ee2bc9cc460af3be106b08e01050
parent2a4e90b18c256d52a7f3f77d58114f6d4e4a7f9f
parent3e0283a53f7d2f2dae7bc4aa7f3104cb5988018f
Merge branch 'linus' into x86/asm, before applying dependent patch

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/Makefile
arch/x86/ia32/ia32entry.S
arch/x86/include/asm/paravirt_types.h
arch/x86/kernel/entry_64.S
arch/x86/kernel/paravirt.c
arch/x86/xen/enlighten.c