diff for duplicates of <20140618103705.15728.70914.stgit@patser>

diff --git a/a/1.txt b/N1/1.txt
index 4aa3868..d4de598 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -356,8 +356,3 @@ index f886985a28b2..fd7def2e0ae2 100644
  
  int dma_buf_fd(struct dma_buf *dmabuf, int flags);
  struct dma_buf *dma_buf_get(int fd);
-
-_______________________________________________
-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 ce28e48..1c18eb8 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,11 @@
   linux-kernel@vger.kernel.org
   dri-devel@lists.freedesktop.org
   linaro-mm-sig@lists.linaro.org
+  robdclark@gmail.com
+  thierry.reding@gmail.com
   ccross@google.com
+  daniel@ffwll.ch
+  sumit.semwal@linaro.org
  " linux-media@vger.kernel.org\0"
  "\00:1\0"
  "b\0"
@@ -369,11 +373,6 @@
  "+\tdma_buf_export_named(priv, ops, size, flags, KBUILD_MODNAME, resv)\n"
  " \n"
  " int dma_buf_fd(struct dma_buf *dmabuf, int flags);\n"
- " struct dma_buf *dma_buf_get(int fd);\n"
- "\n"
- "_______________________________________________\n"
- "dri-devel mailing list\n"
- "dri-devel@lists.freedesktop.org\n"
- http://lists.freedesktop.org/mailman/listinfo/dri-devel
+  struct dma_buf *dma_buf_get(int fd);
 
-4d55f08ee746849c3e3846d638fcaf4fa5288c6b5ebd9e4071f2daca69ccbf51
+d1c6c3837dfd66f4481f59d4d0f6738df6e11158efb6b15272e0c480d65843ba
