Merge tag 'v3.6-rc7' into next

Linux 3.6-rc7

Requested by David Howells so he can merge his key susbsystem work into
my tree with requisite -linus changesets.

1 files changed, 11 insertions, 0 deletions

diff --git a/Documentation/filesystems/vfat.txt b/Documentation/filesystems/vfat.txt
index ead764b2728f..de1e6c4dccff 100644
--- a/Documentation/filesystems/vfat.txt
+++ b/Documentation/filesystems/vfat.txt
@@ -137,6 +137,17 @@ errors=panic|continue|remount-ro
                  without doing anything or remount the partition in
                  read-only mode (default behavior).
 
+discard       -- If set, issues discard/TRIM commands to the block
+                 device when blocks are freed. This is useful for SSD devices
+                 and sparse/thinly-provisoned LUNs.
+
+nfs           -- This option maintains an index (cache) of directory
+                 inodes by i_logstart which is used by the nfs-related code to
+                 improve look-ups.
+
+                 Enable this only if you want to export the FAT filesystem
+                 over NFS
+
 <bool>: 0,1,yes,no,true,false
 
 TODO