Merge reason: pick up perf fixlets

Signed-off-by: Ingo Molnar <mingo@elte.hu>