Merge branch 'linus' into WIP.x86/mm, to resolve conflict

Conflicts:
	arch/x86/mm/tlb.c

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