diff for duplicates of <53CF5EFE.6070307@canonical.com>

diff --git a/a/1.txt b/N1/1.txt
index f13cf26..fef49f6 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -42,8 +42,3 @@ The lockup handling calls radeon_fence_wait, not the generic fence_wait. It does
 And lockdep should have complained if I screwed that up. :-)
 
 ~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 b6dc983..4c8380f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -19,7 +19,8 @@
  "To\0Christian K\303\266nig <christian.koenig@amd.com>"
  " Christian K\303\266nig <deathsimple@vodafone.de>"
  " Daniel Vetter <daniel.vetter@ffwll.ch>\0"
- "Cc\0Thomas Hellstrom <thellstrom@vmware.com>"
+ "Cc\0Dave 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>
@@ -71,11 +72,6 @@
  "The lockup handling calls radeon_fence_wait, not the generic fence_wait. It doesn't call the exported wait function that takes the exclusive_lock in read mode.\n"
  "And lockdep should have complained if I screwed that up. :-)\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
 
-4ae594c051ba744a3a1bcb049beab003b8d619bd98e7a840bb9b703225cedefe
+56d246065ffce9dd3b31aedafd8781dd3c9214c19ea788aae584f16c8fae5419
