Merge reason: Pick up updates before queueing up dependent patches.
Signed-off-by: NIngo Molnar <mingo@elte.hu>