Merge reason: this branch was on an -rc4 base, merge it up to -rc6
              to get the latest upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>