Conflicts: arch/x86/kernel/cpu/common.c arch/x86/kernel/signal_64.c include/asm-x86/cpufeature.h |
||
|---|---|---|
| .. | ||
| cpu_32.c | ||
| cpu_64.c | ||
| hibernate_32.c | ||
| hibernate_64.c | ||
| hibernate_asm_32.S | ||
| hibernate_asm_64.S | ||
| Makefile | ||
Conflicts: arch/x86/kernel/cpu/common.c arch/x86/kernel/signal_64.c include/asm-x86/cpufeature.h |
||
|---|---|---|
| .. | ||
| cpu_32.c | ||
| cpu_64.c | ||
| hibernate_32.c | ||
| hibernate_64.c | ||
| hibernate_asm_32.S | ||
| hibernate_asm_64.S | ||
| Makefile | ||