Merge in fixes before we queue up dependent bits, to avoid conflicts.
Signed-off-by: NIngo Molnar <mingo@kernel.org>