diff for duplicates of <5476E1E7.1030402@canonical.com>

diff --git a/a/1.txt b/N1/1.txt
index 30ac6b6..49e2f32 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -322,9 +322,3 @@ index 515cd9aebb99..c1a4ffebc206 100644
  		spin_unlock_irqrestore(&fctx->lock, flags);
  	}
  	return fence_is_signaled(&fence->base);
-
-
-_______________________________________________
-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 95f839c..e23c707 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -14,9 +14,10 @@
  "Date\0Thu, 27 Nov 2014 09:33:43 +0100\0"
  "To\0Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>"
  " Michael Marineau <mike@marineau.org>\0"
- "Cc\0linux-kernel@vger.kernel.org"
-  dri-devel@lists.freedesktop.org
- " Ben Skeggs <bskeggs@redhat.com>\0"
+ "Cc\0David Airlie <airlied@linux.ie>"
+  linux-kernel@vger.kernel.org
+  Ben Skeggs <bskeggs@redhat.com>
+ " dri-devel@lists.freedesktop.org\0"
  "\00:1\0"
  "b\0"
  "Hey,\n"
@@ -342,12 +343,6 @@
  "+\t\tnouveau_fence_update(fence->channel, fctx, 0);\n"
  " \t\tspin_unlock_irqrestore(&fctx->lock, flags);\n"
  " \t}\n"
- " \treturn fence_is_signaled(&fence->base);\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "dri-devel mailing list\n"
- "dri-devel@lists.freedesktop.org\n"
- http://lists.freedesktop.org/mailman/listinfo/dri-devel
+ " \treturn fence_is_signaled(&fence->base);"
 
-58b7bb2caac65fc24ab120427a253b3c03087e0ba736ffe626d0d331ba3f3eb4
+8086523efac850339d288e6ca0e5fa1e74d8f5dc31631058fde74565cee72a90
