Conflicts:

	arch/x86/xen/enlighten.c
	arch/x86/xen/mmu.c
Signed-off-by: NIngo Molnar <mingo@elte.hu>