Merge reason: We are going to queue up a dependent patch.
Signed-off-by: NIngo Molnar <mingo@elte.hu>