139963f9a9
Conflicts: arch/x86/include/asm/cpufeature.h arch/x86/include/asm/cpufeatures.h arch/x86/include/asm/disabled-features.h arch/x86/include/asm/required-features.h arch/x86/kernel/mpparse.c scripts/mod/modpost.c |
||
---|---|---|
.. | ||
alpha/include | ||
arc/include/uapi/asm | ||
arm/include | ||
arm64/include | ||
csky/include/uapi/asm | ||
hexagon/include/uapi/asm | ||
ia64/include | ||
loongarch/include/uapi/asm | ||
microblaze/include/uapi/asm | ||
mips/include | ||
parisc/include/uapi/asm | ||
powerpc/include | ||
riscv/include/uapi/asm | ||
s390/include | ||
sh/include | ||
sparc/include | ||
x86 | ||
xtensa/include |