diff for duplicates of <20160502211151.GA2531@joana>

diff --git a/a/1.txt b/N1/1.txt
index 3d8dc3b..4855e4c 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -24,7 +24,3 @@ this has been fixed in v2 already and Greg pulled everything into
 staging next already.
 
 	Gustavo
-_______________________________________________
-dri-devel mailing list
-dri-devel@lists.freedesktop.org
-https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/a/content_digest b/N1/content_digest
index cc33ebf..f2e88c4 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,16 +5,20 @@
  "Subject\0Re: [PATCH 01/12] staging/android: remove redundant comments on sync_merge_data\0"
  "Date\0Mon, 2 May 2016 18:11:51 -0300\0"
  "To\0Pavel Machek <pavel@ucw.cz>\0"
- "Cc\0devel@driverdev.osuosl.org"
-  Daniel Stone <daniels@collabora.com>
-  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+ "Cc\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
   linux-kernel@vger.kernel.org
+  devel@driverdev.osuosl.org
   dri-devel@lists.freedesktop.org
+  Daniel Stone <daniels@collabora.com>
  " Arve Hj\303\270nnev\303\245g <arve@android.com>"
-  Daniel Vetter <daniel.vetter@ffwll.ch>
   Riley Andrews <riandrews@android.com>
-  Gustavo Padovan <gustavo.padovan@collabora.co.uk>
- " John Harrison <John.C.Harrison@intel.com>\0"
+  Daniel Vetter <daniel.vetter@ffwll.ch>
+  Rob Clark <robdclark@gmail.com>
+  Greg Hackmann <ghackmann@google.com>
+  John Harrison <John.C.Harrison@intel.com>
+  Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
+  Sumit Semwal <sumit.semwal@linaro.org>
+ " Gustavo Padovan <gustavo.padovan@collabora.co.uk>\0"
  "\00:1\0"
  "b\0"
  "2016-05-02 Pavel Machek <pavel@ucw.cz>:\n"
@@ -42,10 +46,6 @@
  "this has been fixed in v2 already and Greg pulled everything into\n"
  "staging next already.\n"
  "\n"
- "\tGustavo\n"
- "_______________________________________________\n"
- "dri-devel mailing list\n"
- "dri-devel@lists.freedesktop.org\n"
- https://lists.freedesktop.org/mailman/listinfo/dri-devel
+ "\tGustavo"
 
-e89b2d10a81629fa14dfeb1105cdf0eeace82dc3234854e4bcec79bbbc815bcf
+954242d3db721bef3eed3209a4a21591ff01a42359a3da0b18ee0ca148b72e39
