Merge in Linus's tree to avoid a conflict.
Signed-off-by: NIngo Molnar <mingo@kernel.org>