diff options
author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
---|---|---|
committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /Documentation/scheduler/00-INDEX | |
parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'Documentation/scheduler/00-INDEX')
-rw-r--r-- | Documentation/scheduler/00-INDEX | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/scheduler/00-INDEX b/Documentation/scheduler/00-INDEX index 3c00c9c3219e..d2651c47ae27 100644 --- a/Documentation/scheduler/00-INDEX +++ b/Documentation/scheduler/00-INDEX | |||
@@ -3,7 +3,7 @@ | |||
3 | sched-arch.txt | 3 | sched-arch.txt |
4 | - CPU Scheduler implementation hints for architecture specific code. | 4 | - CPU Scheduler implementation hints for architecture specific code. |
5 | sched-design-CFS.txt | 5 | sched-design-CFS.txt |
6 | - goals, design and implementation of the Complete Fair Scheduler. | 6 | - goals, design and implementation of the Completely Fair Scheduler. |
7 | sched-domains.txt | 7 | sched-domains.txt |
8 | - information on scheduling domains. | 8 | - information on scheduling domains. |
9 | sched-nice-design.txt | 9 | sched-nice-design.txt |