diff for duplicates of <20170908131825.308167186@linuxfoundation.org>

diff --git a/a/1.txt b/N1/1.txt
index dce92e6..65455bc 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -57,9 +57,3 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  done:
  	pm_runtime_put_autosuspend(dev->dev);
  	return ret;
-
-
-_______________________________________________
-dri-devel mailing list
-dri-devel@lists.freedesktop.org
-https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/a/content_digest b/N1/content_digest
index 620e8a1..cad100b 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -4,11 +4,13 @@
  "Date\0Fri,  8 Sep 2017 15:19:11 +0200\0"
  "To\0linux-kernel@vger.kernel.org\0"
  "Cc\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
-  dri-devel@lists.freedesktop.org
-  Daniel Vetter <daniel.vetter@ffwll.ch>
+  stable@vger.kernel.org
   Ben Skeggs <bskeggs@redhat.com>
+  dri-devel@lists.freedesktop.org
   nouveau@lists.freedesktop.org
- " stable@vger.kernel.org\0"
+  Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
+  Sean Paul <seanpaul@chromium.org>
+ " Daniel Vetter <daniel.vetter@ffwll.ch>\0"
  "\00:1\0"
  "b\0"
  "4.13-stable review patch.  If anyone has any objections, please let me know.\n"
@@ -69,12 +71,6 @@
  "+\t\tdrm_atomic_helper_cleanup_planes(dev, state);\n"
  " done:\n"
  " \tpm_runtime_put_autosuspend(dev->dev);\n"
- " \treturn ret;\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "dri-devel mailing list\n"
- "dri-devel@lists.freedesktop.org\n"
- https://lists.freedesktop.org/mailman/listinfo/dri-devel
+ " \treturn ret;"
 
-c83b7a374fafdea53a5e4257cdbed293bb984b773778519f438238224de16130
+374566a4b090218d8db84c10981639c72a21b3b4cf6e8ac608b2e164c1350d96
