You need to sign in or sign up before continuing.
-
Ingo Molnar authored
Conflicts: arch/x86/mach-default/setup.c Semantic conflict resolution: arch/x86/kernel/setup.c Signed-off-by:Ingo Molnar <mingo@elte.hu>
fc6fc7f1
Conflicts:
arch/x86/mach-default/setup.c
Semantic conflict resolution:
arch/x86/kernel/setup.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>