Merge reason: This brach was on -rc1, refresh it to almost-rc4 to pick up
              the latest upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>