diff for duplicates of <1297691128.1857.4.camel@dan>

diff --git a/a/1.txt b/N1/1.txt
index 6726d7f..0089445 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -26,9 +26,3 @@ index cec89dd..85668ef 100644
  	geo->blocksize = mp->m_sb.sb_blocksize;
  	geo->rtextsize = mp->m_sb.sb_rextsize;
  	geo->agblocks = mp->m_sb.sb_agblocks;
-
-
-_______________________________________________
-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 9d6e8bc..23cba6e 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -7,9 +7,9 @@
   aelder@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"
@@ -39,12 +39,6 @@
  "+\n"
  " \tgeo->blocksize = mp->m_sb.sb_blocksize;\n"
  " \tgeo->rtextsize = mp->m_sb.sb_rextsize;\n"
- " \tgeo->agblocks = mp->m_sb.sb_agblocks;\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "xfs mailing list\n"
- "xfs@oss.sgi.com\n"
- http://oss.sgi.com/mailman/listinfo/xfs
+ " \tgeo->agblocks = mp->m_sb.sb_agblocks;"
 
-cf6d8042ab798a3572c56fa695eb7671d103b8693a392ebd9712abac5c00c0be
+c34994ead664e68747a54d56253510b957774c52b1f38e1e660b5d0f4fe7797e
