---

yaml --- r: 339443 b: refs/heads/master c: 0acba3c h: refs/heads/master i: 339441: f39cd3e 339439: cac0505 v: v3
git-mirror · Nov 26, 2012 · 670d829 · 670d829
1 parent 133fd32
commit 670d829
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e446be44806240c779666591bb9e8cb0e86a50d
+refs/heads/master: 0acba3cd018c51e529a6f008c092629ad2e9e0a4
diff --git a/trunk/Documentation/filesystems/xfs.txt b/trunk/Documentation/filesystems/xfs.txt
@@ -43,7 +43,7 @@ When mounting an XFS filesystem, the following options are accepted.
 	Issue command to let the block device reclaim space freed by the
 	filesystem.  This is useful for SSD devices, thinly provisioned
 	LUNs and virtual machine images, but may have a performance
-	impact.  This option is incompatible with the nodelaylog option.
+	impact.
 
   dmapi
 	Enable the DMAPI (Data Management API) event callouts.