Conflicts:
	arch/x86/kernel/head64.c
	arch/x86/mm/mmap.c
Signed-off-by: NIngo Molnar <mingo@kernel.org>