diff for duplicates of <53CF64F9.7020701@canonical.com>

diff --git a/a/1.txt b/N1/1.txt
index 3e54bd4..2cff001 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -23,8 +23,3 @@ Yeah but all the fences that have .enable_signaling will get signaled from a sin
 I haven't had a problem with interrupts on my mbp after d1f9809ed1315c4cdc5760cf2f59626fd3276952, but it should be trivial to start a timer that periodically does wake_up_all, and gets its timeout reset in a call to radeon_fence_process. It could either be added as a work item, or as a normal timer (disabled during gpu lockup recovery to prevent checks from fiddling with things it shouldn't).
 
 ~Maarten
-
-_______________________________________________
-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 b0cbfe4..cd92107 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -21,7 +21,9 @@
  "Date\0Wed, 23 Jul 2014 09:32:09 +0200\0"
  "To\0Christian K\303\266nig <christian.koenig@amd.com>"
  " Daniel Vetter <daniel.vetter@ffwll.ch>\0"
- "Cc\0Thomas Hellstrom <thellstrom@vmware.com>"
+ "Cc\0Christian K\303\266nig <deathsimple@vodafone.de>"
+  Dave Airlie <airlied@gmail.com>
+  Thomas Hellstrom <thellstrom@vmware.com>
   nouveau <nouveau@lists.freedesktop.org>
   LKML <linux-kernel@vger.kernel.org>
   dri-devel <dri-devel@lists.freedesktop.org>
@@ -54,11 +56,6 @@
  "> Apart from that interrupts on Macs usually don't work at all, so we really need a solution where calling fence_signaled() is completely optional.\n"
  "I haven't had a problem with interrupts on my mbp after d1f9809ed1315c4cdc5760cf2f59626fd3276952, but it should be trivial to start a timer that periodically does wake_up_all, and gets its timeout reset in a call to radeon_fence_process. It could either be added as a work item, or as a normal timer (disabled during gpu lockup recovery to prevent checks from fiddling with things it shouldn't).\n"
  "\n"
- "~Maarten\n"
- "\n"
- "_______________________________________________\n"
- "dri-devel mailing list\n"
- "dri-devel@lists.freedesktop.org\n"
- http://lists.freedesktop.org/mailman/listinfo/dri-devel
+ ~Maarten
 
-f953d736372698df5230e42f4d941ba6c100a1af447b11b408137dcc6f8ef73b
+c817aff0cc277635b9da785365a9263444ec27871a00d657bff42d858e5b5315
