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/sysctl/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/sysctl/00-INDEX')
| -rw-r--r-- | Documentation/sysctl/00-INDEX | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/sysctl/00-INDEX b/Documentation/sysctl/00-INDEX index 1286f455992f..8cf5d493fd03 100644 --- a/Documentation/sysctl/00-INDEX +++ b/Documentation/sysctl/00-INDEX | |||
| @@ -4,8 +4,6 @@ README | |||
| 4 | - general information about /proc/sys/ sysctl files. | 4 | - general information about /proc/sys/ sysctl files. |
| 5 | abi.txt | 5 | abi.txt |
| 6 | - documentation for /proc/sys/abi/*. | 6 | - documentation for /proc/sys/abi/*. |
| 7 | ctl_unnumbered.txt | ||
| 8 | - explanation of why one should not add new binary sysctl numbers. | ||
| 9 | fs.txt | 7 | fs.txt |
| 10 | - documentation for /proc/sys/fs/*. | 8 | - documentation for /proc/sys/fs/*. |
| 11 | kernel.txt | 9 | kernel.txt |