tree 6a5db62915abd260241a2b9aee34086c93293ca6
parent 54d35f29f49224d86b994acb6e5969b9ba09022d
parent 78af08d90b8f745044b1274430bc4bc6b2b27aca
author Ingo Molnar <mingo@elte.hu> 1247925022 +0200
committer Ingo Molnar <mingo@elte.hu> 1247925040 +0200

Merge branch 'linus' into sched/core

Merge reason: branch had an old upstream base (-rc1-ish), but also
              merge to avoid a conflict.

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