Merge branch 'x86/fixmap' into x86/devel
authorIngo Molnar <mingo@elte.hu>
Tue, 8 Jul 2008 10:24:29 +0000 (12:24 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 8 Jul 2008 10:24:29 +0000 (12:24 +0200)
Conflicts:

arch/x86/mm/init_64.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
arch/x86/kernel/paravirt.c
arch/x86/mm/init_64.c
arch/x86/mm/pgtable.c
arch/x86/xen/enlighten.c
include/asm-x86/fixmap_32.h
include/asm-x86/paravirt.h
include/asm-x86/pgtable.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge