diff for duplicates of <55A4EBD7.3050406@linux.intel.com>

diff --git a/a/1.txt b/N1/1.txt
index 66e464c..ae0b821 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -70,8 +70,3 @@ index 85ac6d85dc39..30e0f54ba19d 100644
  		} else if (crtc->state->enable) {
  			intel_crtc_disable_planes(crtc);
  			dev_priv->display.crtc_disable(crtc);
-
-_______________________________________________
-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 5e2b7d4..c779988 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -10,8 +10,9 @@
  "Date\0Tue, 14 Jul 2015 13:00:39 +0200\0"
  "To\0J\303\266rg Otte <jrg.otte@gmail.com>\0"
  "Cc\0Linus Torvalds <torvalds@linux-foundation.org>"
-  Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
- " DRI <dri-devel@lists.freedesktop.org>\0"
+  David Airlie <airlied@linux.ie>
+  DRI <dri-devel@lists.freedesktop.org>
+ " Linux Kernel Mailing List <linux-kernel@vger.kernel.org>\0"
  "\00:1\0"
  "b\0"
  "When resuming with dpms off, the following warn can happen:\n"
@@ -85,11 +86,6 @@
  "+\t\t\t\tintel_crtc_disable(crtc);\n"
  " \t\t} else if (crtc->state->enable) {\n"
  " \t\t\tintel_crtc_disable_planes(crtc);\n"
- " \t\t\tdev_priv->display.crtc_disable(crtc);\n"
- "\n"
- "_______________________________________________\n"
- "dri-devel mailing list\n"
- "dri-devel@lists.freedesktop.org\n"
- http://lists.freedesktop.org/mailman/listinfo/dri-devel
+ " \t\t\tdev_priv->display.crtc_disable(crtc);"
 
-ebddde368ec9975ddbc024cb1d4529dbd6a2ff3eac48b965ee62978eee5bc805
+5b2100ff180784eec4f59d538af81384e106076b69cc33f7fff5a3ac1aa090e0
