| commit | 5304d5fc74a269cc6c3e70f9713684ca729abdf0 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Sat Jul 18 15:50:22 2009 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Sat Jul 18 15:50:40 2009 +0200 |
| tree | 6a5db62915abd260241a2b9aee34086c93293ca6 | |
| parent | 54d35f29f49224d86b994acb6e5969b9ba09022d [diff] | |
| parent | 78af08d90b8f745044b1274430bc4bc6b2b27aca [diff] |
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>