mirror of
https://github.com/torvalds/linux.git
synced 2025-11-03 10:10:33 +02:00
Conflicts: arch/x86/mach-default/setup.c Semantic conflict resolution: arch/x86/kernel/setup.c Signed-off-by: Ingo Molnar <mingo@elte.hu> |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| empty.c | ||
| file2alias.c | ||
| Makefile | ||
| mk_elfconfig.c | ||
| modpost.c | ||
| modpost.h | ||
| sumversion.c | ||