a3251c1a36
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> |
||
---|---|---|
.. | ||
asm | ||
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 |