diff options
| author | Jonathan Herman <hermanjl@cs.unc.edu> | 2012-09-29 13:04:40 -0400 |
|---|---|---|
| committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2012-09-29 13:04:40 -0400 |
| commit | daf1e620bff2cb6d830ef66725369bba9c858f62 (patch) | |
| tree | 1aed8f7cb55371c70d2139b6754d90ea89a26147 /kernel/elfcore.c | |
| parent | 451ed3b075c2a8e322e5a44f177e2470426a821d (diff) | |
| parent | 1cb90226816c7af7808be4c0de866c54da17ecc9 (diff) | |
Merge branch 'wip-color' into wip-mc
Conflicts:
include/litmus/budget.h
include/litmus/litmus.h
include/litmus/rt_param.h
include/litmus/sched_trace.h
include/litmus/trace.h
include/trace/events/litmus.h
litmus/Makefile
litmus/budget.c
litmus/ftdev.c
litmus/jobs.c
litmus/litmus.c
litmus/locking.c
litmus/preempt.c
litmus/rt_domain.c
litmus/sched_gsn_edf.c
litmus/trace.c
Diffstat (limited to 'kernel/elfcore.c')
0 files changed, 0 insertions, 0 deletions