diff options
| author | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2008-05-01 00:08:56 -0400 |
|---|---|---|
| committer | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2008-05-01 00:08:56 -0400 |
| commit | 922eb113844e1837e401405a8558660fff72ebe1 (patch) | |
| tree | c1a469b4a44dad60323b349001dd46e4c6950221 /COPYING | |
| parent | f31140bd20871265106d4854b9f6c81e58bd7c48 (diff) | |
| parent | d5f64980b4e9970bf9bdcb0acf35cfc6e3dfa701 (diff) | |
Merge branch 'synch_quanta' into merge
Conflicts:
litmus/edf_common.c
litmus/sched_gsn_edf.c
litmus/sched_psn_edf.c
Minor clashes between sched_clock() -> litmus_clock() and jobs.c refactoring
merged by hand. The result has been compile-tested.
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions