diff for duplicates of <565495AC.9050008@google.com>

diff --git a/a/1.txt b/N1/1.txt
index c1342d0..72a7e9e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -16,7 +16,3 @@ AFAIK CONFIG_SW_SYNC_USER is the only part people have been objecting
 to.  I'm fine with removing it.  Removing the kernel-facing side of 
 sw_sync would be a problem for us, since many drivers use it to create 
 their fences.
-_______________________________________________
-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 20f2f00..196584f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -4,13 +4,14 @@
  "Date\0Tue, 24 Nov 2015 08:51:56 -0800\0"
  "To\0Gustavo Padovan <gustavo@padovan.org>"
  " greg@kroah.com\0"
- "Cc\0daniels@collabora.com"
-  Daniel Vetter <daniel.vetter@ffwll.ch>
- " Arve Hj\303\270nnev\303\245g <arve@android.com>"
+ "Cc\0linux-kernel@vger.kernel.org"
   dri-devel@lists.freedesktop.org
-  linux-kernel@vger.kernel.org
-  Riley Andrews <riandrews@android.com>
+  daniels@collabora.com
   Gustavo Padovan <gustavo.padovan@collabora.co.uk>
+ " Arve Hj\303\270nnev\303\245g <arve@android.com>"
+  Riley Andrews <riandrews@android.com>
+  Daniel Vetter <daniel.vetter@ffwll.ch>
+  Rob Clark <robdclark@gmail.com>
  " John Harrison <John.C.Harrison@intel.com>\0"
  "\00:1\0"
  "b\0"
@@ -31,10 +32,6 @@
  "AFAIK CONFIG_SW_SYNC_USER is the only part people have been objecting \n"
  "to.  I'm fine with removing it.  Removing the kernel-facing side of \n"
  "sw_sync would be a problem for us, since many drivers use it to create \n"
- "their fences.\n"
- "_______________________________________________\n"
- "dri-devel mailing list\n"
- "dri-devel@lists.freedesktop.org\n"
- http://lists.freedesktop.org/mailman/listinfo/dri-devel
+ their fences.
 
-80a8c5ff7a297b6f9a9f3cb0ce6203a254e23107930bc0f5f5cecef5ebb9a196
+3cf0d62c6ae1642c27697b30c6529ff545c04999622b9dc7600fa6f047a0b81b
