a3ec4a603f
Merge reason: pick up upstream fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Merge reason: pick up upstream fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>