diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
| commit | 988addf82e4c03739375279de73929580a2d4a6a (patch) | |
| tree | 989ae1cd4e264bbad80c65f04480486246e7b9f3 /Documentation/filesystems/00-INDEX | |
| parent | 004c1c7096659d352b83047a7593e91d8a30e3c5 (diff) | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
Merge branch 'origin' into devel-stable
Conflicts:
arch/arm/mach-mx2/devices.c
arch/arm/mach-mx2/devices.h
sound/soc/pxa/pxa-ssp.c
Diffstat (limited to 'Documentation/filesystems/00-INDEX')
| -rw-r--r-- | Documentation/filesystems/00-INDEX | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/filesystems/00-INDEX b/Documentation/filesystems/00-INDEX index 875d49696b6e..5139b8c9d5af 100644 --- a/Documentation/filesystems/00-INDEX +++ b/Documentation/filesystems/00-INDEX | |||
| @@ -62,6 +62,8 @@ jfs.txt | |||
| 62 | - info and mount options for the JFS filesystem. | 62 | - info and mount options for the JFS filesystem. |
| 63 | locks.txt | 63 | locks.txt |
| 64 | - info on file locking implementations, flock() vs. fcntl(), etc. | 64 | - info on file locking implementations, flock() vs. fcntl(), etc. |
| 65 | logfs.txt | ||
| 66 | - info on the LogFS flash filesystem. | ||
| 65 | mandatory-locking.txt | 67 | mandatory-locking.txt |
| 66 | - info on the Linux implementation of Sys V mandatory file locking. | 68 | - info on the Linux implementation of Sys V mandatory file locking. |
| 67 | ncpfs.txt | 69 | ncpfs.txt |