Merge it in to pick up a fix that we are going to clean up in this
branch.
Signed-off-by: NIngo Molnar <mingo@kernel.org>