mirror of
https://github.com/genesi/linux-legacy.git
synced 2026-02-16 22:14:54 +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>