diff for duplicates of <4B3C64D4.3060706@cn.fujitsu.com>

diff --git a/a/1.txt b/N1/1.txt
index aac3243..a92969e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1617,8 +1617,3 @@ index c40834b..23b1f22 100644
  	TP_PROTO(struct xfs_da_args *args, int src_idx, int dst_idx, int count),
 -- 
 1.6.3
-
-_______________________________________________
-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 6db8783..ed7a7a8 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,12 +2,12 @@
  "Subject\0[PATCH] xfs: Convert some trace events to DEFINE_TRACE\0"
  "Date\0Thu, 31 Dec 2009 16:46:12 +0800\0"
  "To\0Alex Elder <aelder@sgi.com>\0"
- "Cc\0Frederic Weisbecker <fweisbec@gmail.com>"
-  LKML <linux-kernel@vger.kernel.org>
-  Steven Rostedt <rostedt@goodmis.org>
+ "Cc\0Christoph Hellwig <hch@infradead.org>"
   xfs@oss.sgi.com
-  Christoph Hellwig <hch@infradead.org>
- " Ingo Molnar <mingo@elte.hu>\0"
+  Ingo Molnar <mingo@elte.hu>
+  Steven Rostedt <rostedt@goodmis.org>
+  Frederic Weisbecker <fweisbec@gmail.com>
+ " LKML <linux-kernel@vger.kernel.org>\0"
  "\00:1\0"
  "b\0"
  "Use DECLARE_EVENT_CLASS/DEFINE_EVENT to remove duplicate code:\n"
@@ -1628,11 +1628,6 @@
  " TRACE_EVENT(xfs_dir2_leafn_moveents,\n"
  " \tTP_PROTO(struct xfs_da_args *args, int src_idx, int dst_idx, int count),\n"
  "-- \n"
- "1.6.3\n"
- "\n"
- "_______________________________________________\n"
- "xfs mailing list\n"
- "xfs@oss.sgi.com\n"
- http://oss.sgi.com/mailman/listinfo/xfs
+ 1.6.3
 
-21744c1a4b2e5f43f4d83fd9a7b43cfbe984a3e50ca1e14d07cb9f52a3057819
+6d4cdd68330e13060a2719f0cd0547eec1d4b49a590d708143afed423a37e7fc
