Merge commit 'b13b1d2d8692' into x86/mm

It got into x86/urgent but isn't really urgent material.

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