Ingo Molnar a3251c1a36 Merge branch 'x86/paravirt' into x86/entry ... Merge in the recent paravirt changes to resolve conflicts caused by objtool annotations. Conflicts: arch/x86/xen/xen-asm.S Signed-off-by: Ingo Molnar <mingo@kernel.org>		2021-02-12 13:36:43 +01:00
..
asm	Merge branch 'x86/paravirt' into x86/entry	2021-02-12 13:36:43 +01:00
cpu-common/cpu
cpu-sh2/cpu
cpu-sh2a/cpu
cpu-sh3/cpu
cpu-sh4/cpu
cpu-sh4a/cpu
mach-common/mach
mach-dreamcast/mach
mach-ecovec24/mach
mach-kfr2r09/mach
mach-landisk/mach
mach-migor/mach
mach-sdk7786/mach
mach-se/mach
mach-sh03/mach
mach-x3proto/mach
uapi/asm