Merge branch 'linus' into x86/mm, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

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

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

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

diff --cc include/linux/mm_types.h
Simple merge