From 670d82950c56493331411d369918da807fcfb0bf Mon Sep 17 00:00:00 2001
From: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
Date: Mon, 26 Nov 2012 15:25:05 +0900
Subject: [PATCH] --- yaml --- r: 339443 b: refs/heads/master c:
 0acba3cd018c51e529a6f008c092629ad2e9e0a4 h: refs/heads/master i:   339441:
 f39cd3e101662b069d9329b0145643fefbf0a34d   339439:
 cac050503f675495832d36873e2f4d3d7e54f074 v: v3

---
 [refs]                                  | 2 +-
 trunk/Documentation/filesystems/xfs.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0e7af58e3717..8c25824e21a8 100644
--- 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
index 17187750270a..3e4b3dd1e046 100644
--- 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.