Conflicts: arch/x86/mach-default/setup.c Semantic conflict resolution: arch/x86/kernel/setup.c Signed-off-by: Ingo Molnar <mingo@elte.hu> |
||
---|---|---|
.. | ||
.gitignore | ||
Makefile | ||
empty.c | ||
file2alias.c | ||
mk_elfconfig.c | ||
modpost.c | ||
modpost.h | ||
sumversion.c |
Conflicts: arch/x86/mach-default/setup.c Semantic conflict resolution: arch/x86/kernel/setup.c Signed-off-by: Ingo Molnar <mingo@elte.hu> |
||
---|---|---|
.. | ||
.gitignore | ||
Makefile | ||
empty.c | ||
file2alias.c | ||
mk_elfconfig.c | ||
modpost.c | ||
modpost.h | ||
sumversion.c |