diff for duplicates of <569983CC.7000207@google.com>

diff --git a/a/1.txt b/N1/1.txt
index b3504b0..69973f9 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -14,7 +14,3 @@ On 01/15/2016 10:02 AM, Gustavo Padovan wrote:
 by the refactoring of Android sync on top of dma-buf fences.
 
 Tom and Dmitry, did you send the proposed fix upstream?
-_______________________________________________
-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 452b50f..d17b5c1 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -7,16 +7,18 @@
  "Date\0Fri, 15 Jan 2016 15:42:04 -0800\0"
  "To\0Gustavo Padovan <gustavo.padovan@collabora.co.uk>"
  " John Harrison <John.C.Harrison@intel.com>\0"
- "Cc\0devel@driverdev.osuosl.org"
-  daniels@collabora.com
-  tomcherry@google.com
+ "Cc\0Gustavo Padovan <gustavo@padovan.org>"
+  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   linux-kernel@vger.kernel.org
+  devel@driverdev.osuosl.org
   dri-devel@lists.freedesktop.org
-  Daniel Vetter <daniel.vetter@ffwll.ch>
-  Maarten Lankhorst <maarten.lankhorst@canonical.com>
+  daniels@collabora.com
  " Arve Hj\303\270nnev\303\245g <arve@android.com>"
-  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   Riley Andrews <riandrews@android.com>
+  Daniel Vetter <daniel.vetter@ffwll.ch>
+  Rob Clark <robdclark@gmail.com>
+  Maarten Lankhorst <maarten.lankhorst@canonical.com>
+  tomcherry@google.com
  " dtor@google.com\0"
  "\00:1\0"
  "b\0"
@@ -35,10 +37,6 @@
  "+Tom Cherry and Dmitry Torokhov recently discovered that this was broken \n"
  "by the refactoring of Android sync on top of dma-buf fences.\n"
  "\n"
- "Tom and Dmitry, did you send the proposed fix upstream?\n"
- "_______________________________________________\n"
- "dri-devel mailing list\n"
- "dri-devel@lists.freedesktop.org\n"
- http://lists.freedesktop.org/mailman/listinfo/dri-devel
+ Tom and Dmitry, did you send the proposed fix upstream?
 
-773c2f100c0495894e1b12cf4ca9618eaf4a71f13f28ae087f8dfa85350fcaf8
+fbc12954d7cff8d7d1da9cacc2bff1d7c3bc928cba2c0196fd720ba33dd02a2d
