Conflicts: arch/x86/purgatory/Makefile Signed-off-by: Ingo Molnar <mingo@kernel.org> |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| Makefile | ||
| entry64.S | ||
| purgatory.c | ||
| setup-x86_64.S | ||
| stack.S | ||
Conflicts: arch/x86/purgatory/Makefile Signed-off-by: Ingo Molnar <mingo@kernel.org> |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| Makefile | ||
| entry64.S | ||
| purgatory.c | ||
| setup-x86_64.S | ||
| stack.S | ||