mirror of
https://gitee.com/openharmony/kernel_linux
synced 2025-05-22 06:36:39 +00:00

Conflicts: arch/x86/mach-default/setup.c Semantic conflict resolution: arch/x86/kernel/setup.c Signed-off-by: Ingo Molnar <mingo@elte.hu>