Merge reason: queue up dependent patch, update to -rc4
Signed-off-by: NIngo Molnar <mingo@elte.hu>