aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/filesystems/00-INDEX
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-08-29 11:39:34 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-08-29 11:39:34 -0400
commit83b7a664a0c7c39ccfa4c72535dc1c001d4e7a18 (patch)
tree5ba3bbbe977c2047658b41e22d6b2abd5686bf15 /Documentation/filesystems/00-INDEX
parent[GFS2] Allow mounting of gfs2 and gfs2meta at the same time (diff)
parentMerge master.kernel.org:/home/rmk/linux-2.6-serial (diff)
downloadlinux-dev-83b7a664a0c7c39ccfa4c72535dc1c001d4e7a18.tar.xz
linux-dev-83b7a664a0c7c39ccfa4c72535dc1c001d4e7a18.zip
Merge branch 'master' into gfs2
Diffstat (limited to 'Documentation/filesystems/00-INDEX')
-rw-r--r--Documentation/filesystems/00-INDEX4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/filesystems/00-INDEX b/Documentation/filesystems/00-INDEX
index 66fdc0744fe0..16dec61d7671 100644
--- a/Documentation/filesystems/00-INDEX
+++ b/Documentation/filesystems/00-INDEX
@@ -62,8 +62,8 @@ ramfs-rootfs-initramfs.txt
- info on the 'in memory' filesystems ramfs, rootfs and initramfs.
reiser4.txt
- info on the Reiser4 filesystem based on dancing tree algorithms.
-relayfs.txt
- - info on relayfs, for efficient streaming from kernel to user space.
+relay.txt
+ - info on relay, for efficient streaming from kernel to user space.
romfs.txt
- description of the ROMFS filesystem.
smbfs.txt