Merge reason: Bring in changes that the next patch will depend on.
Signed-off-by: NIngo Molnar <mingo@elte.hu>