| commit | f57aec5a871907427060196f6bac3d0011b38450 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Wed Jun 25 12:26:59 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Wed Jun 25 12:26:59 2008 +0200 |
| tree | fec11fec6cf8e2454e07bd04ac137cad85075611 | |
| parent | 1de8644cc7c826e0c41e52825bd5a12e2e31e6ca [diff] | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 [diff] |
Merge branch 'linus' into sched/devel Conflicts: kernel/sched_rt.c Signed-off-by: Ingo Molnar <mingo@elte.hu>