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

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