Merge reason: Update from an ancient -rc1 base to an almost-final stable kernel.
Signed-off-by: NIngo Molnar <mingo@elte.hu>