diff for duplicates of <20160415182934.GB23954@joana>

diff --git a/a/1.txt b/N1/1.txt
index 90ed3ec..29c5106 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -21,7 +21,3 @@
 You mean asking for a new context for every collection?
 
 	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 0c4e8ae..33192a8 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -7,18 +7,21 @@
  "Subject\0Re: [RFC 1/8] dma-buf/fence: add fence_collection fences\0"
  "Date\0Fri, 15 Apr 2016 11:29:34 -0700\0"
  "To\0Daniel Vetter <daniel@ffwll.ch>\0"
- "Cc\0St\303\251phane Marchesin <marcheu@google.com>"
-  Daniel Stone <daniels@collabora.com>
-  Sean Paul <seanpaul@google.com>
- " Arve Hj\303\270nnev\303\245g <arve@android.com>"
+ "Cc\0Christian K\303\266nig <christian.koenig@amd.com>"
   dri-devel <dri-devel@lists.freedesktop.org>
   Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
+  Daniel Stone <daniels@collabora.com>
+ " Arve Hj\303\270nnev\303\245g <arve@android.com>"
   Riley Andrews <riandrews@android.com>
-  m.chehab@samsung.com
-  Gustavo Padovan <gustavo.padovan@collabora.co.uk>
- " Christian K\303\266nig <christian.koenig@amd.com>"
+  Rob Clark <robdclark@gmail.com>
+  Greg Hackmann <ghackmann@google.com>
   John Harrison <John.C.Harrison@intel.com>
- " Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0"
+  Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+  Sean Paul <seanpaul@google.com>
+ " St\303\251phane Marchesin <marcheu@google.com>"
+  m.chehab@samsung.com
+  Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
+ " Gustavo Padovan <gustavo.padovan@collabora.co.uk>\0"
  "\00:1\0"
  "b\0"
  "2016-04-15 Daniel Vetter <daniel@ffwll.ch>:\n"
@@ -43,10 +46,6 @@
  "\n"
  "You mean asking for a new context for every collection?\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"
 
-b00d3d92a8dd5aebcd5215cfc98c6e6df978100777fc2a100a6bde86e9255f3e
+937adaea0dd767365a1a0a2f85c26341725ec662c214aaa6a7290ac276df8b06
