diff for duplicates of <20100721121904.GA17637@lst.de>

diff --git a/a/1.txt b/N1/1.txt
index 5ec3ee1..e80b9b4 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -5,8 +5,3 @@ On Wed, Jul 21, 2010 at 01:36:47PM +0200, Christian Dietrich wrote:
 > an empty string. So we can remove all references to it.
 
 This code is already gone in the XFS queue for the next merge window.
-
-_______________________________________________
-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 f427a92..2f1970c 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -3,15 +3,15 @@
  "Subject\0Re: [xfs-masters] [PATCH] fs/xfs: Remove dead CONFIG_XFS_DMAPI\0"
  "Date\0Wed, 21 Jul 2010 14:19:04 +0200\0"
  "To\0Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>\0"
- "Cc\0Andrew Morton <akpm@linux-foundation.org>"
-  linux-kernel@vger.kernel.org
-  xfs@oss.sgi.com
+ "Cc\0Alex Elder <aelder@sgi.com>"
   xfs-masters@oss.sgi.com
-  vamos-dev@i4.informatik.uni-erlangen.de
-  Al Viro <viro@zeniv.linux.org.uk>
-  Alex Elder <aelder@sgi.com>
   Stephen Hemminger <shemminger@vyatta.com>
- " Alexey Dobriyan <adobriyan@gmail.com>\0"
+  Andrew Morton <akpm@linux-foundation.org>
+  Alexey Dobriyan <adobriyan@gmail.com>
+  Al Viro <viro@zeniv.linux.org.uk>
+  xfs@oss.sgi.com
+  linux-kernel@vger.kernel.org
+ " vamos-dev@i4.informatik.uni-erlangen.de\0"
  "\00:1\0"
  "b\0"
  "On Wed, Jul 21, 2010 at 01:36:47PM +0200, Christian Dietrich wrote:\n"
@@ -20,11 +20,6 @@
  "> code. Because XFS_DMAPI is never defined, XFS_DMAPI_STRING is always\n"
  "> an empty string. So we can remove all references to it.\n"
  "\n"
- "This code is already gone in the XFS queue for the next merge window.\n"
- "\n"
- "_______________________________________________\n"
- "xfs mailing list\n"
- "xfs@oss.sgi.com\n"
- http://oss.sgi.com/mailman/listinfo/xfs
+ This code is already gone in the XFS queue for the next merge window.
 
-4d082916d5e356f617d97cf3317774f2af8ed44a588a8478fb29c0933e92584c
+99288555b96e3ce42e73a9c1cce613c0808b9909e1bd4230b109536964165d73
