diff --git a/[refs] b/[refs] index 2117e454d8bf..f4228bdd8943 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9b1a4d160f68397d29183ce76af1cc774508aba +refs/heads/master: d3cf91d0e201962a6367191e5926f5b0920b0339 diff --git a/trunk/Documentation/00-INDEX b/trunk/Documentation/00-INDEX index bb5e21034209..4d4dde447fe7 100644 --- a/trunk/Documentation/00-INDEX +++ b/trunk/Documentation/00-INDEX @@ -358,8 +358,6 @@ sgi-visws.txt - short blurb on the SGI Visual Workstations. sh/ - directory with info on porting Linux to a new architecture. -sharedsubtree.txt - - a description of shared subtrees for namespaces. smart-config.txt - description of the Smart Config makefile feature. sony-laptop.txt diff --git a/trunk/Documentation/filesystems/00-INDEX b/trunk/Documentation/filesystems/00-INDEX index 632fe3f376eb..e68021c08fbd 100644 --- a/trunk/Documentation/filesystems/00-INDEX +++ b/trunk/Documentation/filesystems/00-INDEX @@ -82,6 +82,8 @@ relay.txt - info on relay, for efficient streaming from kernel to user space. romfs.txt - description of the ROMFS filesystem. +sharedsubtree.txt + - a description of shared subtrees for namespaces. smbfs.txt - info on using filesystems with the SMB protocol (Win 3.11 and NT). spufs.txt diff --git a/trunk/Documentation/sharedsubtree.txt b/trunk/Documentation/filesystems/sharedsubtree.txt similarity index 100% rename from trunk/Documentation/sharedsubtree.txt rename to trunk/Documentation/filesystems/sharedsubtree.txt