diff options
-rw-r--r-- | Documentation/00-INDEX | 2 | ||||
-rw-r--r-- | Documentation/filesystems/00-INDEX | 2 | ||||
-rw-r--r-- | Documentation/filesystems/locks.txt (renamed from Documentation/locks.txt) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX index 910473cb1c1c..cc10ce7dc339 100644 --- a/Documentation/00-INDEX +++ b/Documentation/00-INDEX | |||
@@ -230,8 +230,6 @@ local_ops.txt | |||
230 | - semantics and behavior of local atomic operations. | 230 | - semantics and behavior of local atomic operations. |
231 | lockdep-design.txt | 231 | lockdep-design.txt |
232 | - documentation on the runtime locking correctness validator. | 232 | - documentation on the runtime locking correctness validator. |
233 | locks.txt | ||
234 | - info on file locking implementations, flock() vs. fcntl(), etc. | ||
235 | logo.gif | 233 | logo.gif |
236 | - full colour GIF image of Linux logo (penguin - Tux). | 234 | - full colour GIF image of Linux logo (penguin - Tux). |
237 | logo.txt | 235 | logo.txt |
diff --git a/Documentation/filesystems/00-INDEX b/Documentation/filesystems/00-INDEX index e801076812a4..599593a17067 100644 --- a/Documentation/filesystems/00-INDEX +++ b/Documentation/filesystems/00-INDEX | |||
@@ -52,6 +52,8 @@ isofs.txt | |||
52 | - info and mount options for the ISO 9660 (CDROM) filesystem. | 52 | - info and mount options for the ISO 9660 (CDROM) filesystem. |
53 | jfs.txt | 53 | jfs.txt |
54 | - info and mount options for the JFS filesystem. | 54 | - info and mount options for the JFS filesystem. |
55 | locks.txt | ||
56 | - info on file locking implementations, flock() vs. fcntl(), etc. | ||
55 | mandatory-locking.txt | 57 | mandatory-locking.txt |
56 | - info on the Linux implementation of Sys V mandatory file locking. | 58 | - info on the Linux implementation of Sys V mandatory file locking. |
57 | ncpfs.txt | 59 | ncpfs.txt |
diff --git a/Documentation/locks.txt b/Documentation/filesystems/locks.txt index fab857accbd6..fab857accbd6 100644 --- a/Documentation/locks.txt +++ b/Documentation/filesystems/locks.txt | |||