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/filesystems/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/filesystems/00-INDEX')
| -rw-r--r-- | Documentation/filesystems/00-INDEX | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/filesystems/00-INDEX b/Documentation/filesystems/00-INDEX index 4303614b5add..8c624a18f67d 100644 --- a/Documentation/filesystems/00-INDEX +++ b/Documentation/filesystems/00-INDEX | |||
| @@ -96,8 +96,6 @@ seq_file.txt | |||
| 96 | - how to use the seq_file API | 96 | - how to use the seq_file API |
| 97 | sharedsubtree.txt | 97 | sharedsubtree.txt |
| 98 | - a description of shared subtrees for namespaces. | 98 | - a description of shared subtrees for namespaces. |
| 99 | smbfs.txt | ||
| 100 | - info on using filesystems with the SMB protocol (Win 3.11 and NT). | ||
| 101 | spufs.txt | 99 | spufs.txt |
| 102 | - info and mount options for the SPU filesystem used on Cell. | 100 | - info and mount options for the SPU filesystem used on Cell. |
| 103 | sysfs-pci.txt | 101 | sysfs-pci.txt |