diff for duplicates of <20160127202540.GD3773@joana>

diff --git a/a/1.txt b/N1/1.txt
index b0afd3e..b011a6b 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -39,7 +39,3 @@ the total length (including the whole struct) is returned in the ioctl.
 Agreed. But I'm currently thinking if we really should keep this ioctl. 
 
 	Gustavo
-_______________________________________________
-dri-devel mailing list
-dri-devel@lists.freedesktop.org
-http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/a/content_digest b/N1/content_digest
index 35651f5..94aa077 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -7,16 +7,19 @@
  "Subject\0Re: [PATCH v2 01/11] dma-buf/sync_file: de-stage sync_file\0"
  "Date\0Wed, 27 Jan 2016 18:25:40 -0200\0"
  "To\0Emil Velikov <emil.l.velikov@gmail.com>\0"
- "Cc\0devel@driverdev.osuosl.org"
-  Daniel Stone <daniels@collabora.com>
+ "Cc\0Maarten Lankhorst <maarten.lankhorst@linux.intel.com>"
   Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   Linux-Kernel@vger. Kernel. Org <linux-kernel@vger.kernel.org>
+  devel@driverdev.osuosl.org
   ML dri-devel <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>
+ " Gustavo Padovan <gustavo.padovan@collabora.co.uk>\0"
  "\00:1\0"
  "b\0"
  "Hi Emil,\n"
@@ -59,10 +62,6 @@
  "\n"
  "Agreed. But I'm currently thinking if we really should keep this ioctl. \n"
  "\n"
- "\tGustavo\n"
- "_______________________________________________\n"
- "dri-devel mailing list\n"
- "dri-devel@lists.freedesktop.org\n"
- http://lists.freedesktop.org/mailman/listinfo/dri-devel
+ "\tGustavo"
 
-3df80ec120e6ada20a20db8ca18fdb096ab855e23acddbc27671926964828462
+fbb7784019ace815c649d822afd78fc27f51a96f42d6ef8e6bb1375aa3939c9a
