diff for duplicates of <1297347904.13370.9.camel@dan>

diff --git a/a/1.txt b/N1/1.txt
index bdc48fc..742eb91 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -23,9 +23,3 @@ index cec89dd..17c4785 100644
  	}
  	if (new_version >= 4) {
  		geo->flags |=
-
-
-_______________________________________________
-xfs mailing list
-xfs@oss.sgi.com
-http://oss.sgi.com/mailman/listinfo/xfs
diff --git a/a/content_digest b/N1/content_digest
index c463afd..d2cf8b1 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -4,9 +4,9 @@
  "To\0aelder@sgi.com"
   xfs-masters@oss.sgi.com
  " xfs@oss.sgi.com\0"
- "Cc\0security@kernel.org"
-  linux-kernel@vger.kernel.org
- " stable@kernel.org\0"
+ "Cc\0linux-kernel@vger.kernel.org"
+  stable@kernel.org
+ " security@kernel.org\0"
  "\00:1\0"
  "b\0"
  "The FSGEOMETRY_V1 ioctl (and its compat equivalent) calls out to\n"
@@ -33,12 +33,6 @@
  "+\t\tgeo->logsunit = 0;\n"
  " \t}\n"
  " \tif (new_version >= 4) {\n"
- " \t\tgeo->flags |=\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "xfs mailing list\n"
- "xfs@oss.sgi.com\n"
- http://oss.sgi.com/mailman/listinfo/xfs
+ " \t\tgeo->flags |="
 
-876e5023b31d54e9e4cdf9cdabdc6d0557118e5130b0c4f956187bb58be959df
+4f6cc60ac949e5bacc3ca20f1459356b476bb81b4466bcc990268bf746ba397f
