Merge branch 'x86/fixmap' into x86/devel

Conflicts:

	arch/x86/mm/init_64.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc arch/x86/kernel/paravirt.c
Simple merge

diff --cc arch/x86/mm/init_64.c
Simple merge

diff --cc arch/x86/mm/pgtable.c
Simple merge

diff --cc arch/x86/xen/enlighten.c
Simple merge

diff --cc include/asm-x86/fixmap_32.h
Simple merge

diff --cc include/asm-x86/paravirt.h
Simple merge

diff --cc include/asm-x86/pgtable.h
Simple merge