diff for duplicates of <20160225152647.GA2479@joana>

diff --git a/a/1.txt b/N1/1.txt
index a33530d..288d271 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -32,7 +32,3 @@
 This patch is already uptream, Greg pushed it in December. :)
 
 	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 a096de5..991866a 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,18 +8,20 @@
  "Subject\0Re: [RFC 26/29] dma-buf/fence: remove pointless fence_timeline_signal at destroy phase\0"
  "Date\0Thu, 25 Feb 2016 12:26:47 -0300\0"
  "To\0Tom Cherry <tomcherry@google.com>\0"
- "Cc\0devel@driverdev.osuosl.org"
-  daniels@collabora.com
+ "Cc\0Greg Hackmann <ghackmann@google.com>"
+  Gustavo Padovan <gustavo.padovan@collabora.co.uk>
+  John Harrison <John.C.Harrison@intel.com>
   Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   linux-kernel@vger.kernel.org
-  Maarten Lankhorst <maarten.lankhorst@canonical.com>
- " Arve Hj\303\270nnev\303\245g <arve@android.com>"
-  Dmitry Torokhov <dtor@google.com>
+  devel@driverdev.osuosl.org
   dri-devel@lists.freedesktop.org
-  Daniel Vetter <daniel.vetter@ffwll.ch>
+  daniels@collabora.com
+ " Arve Hj\303\270nnev\303\245g <arve@android.com>"
   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>
+  Maarten Lankhorst <maarten.lankhorst@canonical.com>
+ " Dmitry Torokhov <dtor@google.com>\0"
  "\00:1\0"
  "b\0"
  "2016-02-09 Tom Cherry <tomcherry@google.com>:\n"
@@ -55,10 +57,6 @@
  "\n"
  "This patch is already uptream, Greg pushed it in December. :)\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"
 
-10c1add2dad99abcd9d3b5fa3ac0ecdfece7e2a58f6668f5f8db3d183b3c957c
+74b628499a47415073cd84b80e5013c6ad4ca387a2a35e5d4b7d3a3f97580b45
