tree 7c9a6966283a6bb12b54e5680a67d203be292930
parent 68c38fc3cb4e5a60f502ee9c45f3dfe70e5165ad
parent cd5b8f8755a89a57fc8c408d284b8b613f090345
author Ingo Molnar <mingo@elte.hu> 1279741502 +0200
committer Ingo Molnar <mingo@elte.hu> 1279741508 +0200

Merge branch 'linus' into sched/core

Merge reason: Move from the -rc3 to the almost-rc6 base.

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