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/block/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/block/00-INDEX')
| -rw-r--r-- | Documentation/block/00-INDEX | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/block/00-INDEX b/Documentation/block/00-INDEX index a406286f6f3e..d111e3b23db0 100644 --- a/Documentation/block/00-INDEX +++ b/Documentation/block/00-INDEX | |||
| @@ -1,7 +1,5 @@ | |||
| 1 | 00-INDEX | 1 | 00-INDEX |
| 2 | - This file | 2 | - This file |
| 3 | barrier.txt | ||
| 4 | - I/O Barriers | ||
| 5 | biodoc.txt | 3 | biodoc.txt |
| 6 | - Notes on the Generic Block Layer Rewrite in Linux 2.5 | 4 | - Notes on the Generic Block Layer Rewrite in Linux 2.5 |
| 7 | capability.txt | 5 | capability.txt |
| @@ -16,3 +14,5 @@ stat.txt | |||
| 16 | - Block layer statistics in /sys/block/<dev>/stat | 14 | - Block layer statistics in /sys/block/<dev>/stat |
| 17 | switching-sched.txt | 15 | switching-sched.txt |
| 18 | - Switching I/O schedulers at runtime | 16 | - Switching I/O schedulers at runtime |
| 17 | writeback_cache_control.txt | ||
| 18 | - Control of volatile write back caches | ||