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

Conflicts:

arch/x86/mm/init_64.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
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