-
由 Ingo Molnar 提交于
Conflicts: arch/x86/include/asm/fixmap_64.h Semantic merge: arch/x86/include/asm/fixmap.h Signed-off-by: NIngo Molnar <mingo@elte.hu>a1413c89
Conflicts:
arch/x86/include/asm/fixmap_64.h
Semantic merge:
arch/x86/include/asm/fixmap.h
Signed-off-by: NIngo Molnar <mingo@elte.hu>