diff for duplicates of <55A352FA.1000300@linux.intel.com>

diff --git a/a/1.txt b/N1/1.txt
index d406e1f..9608be4 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -41,9 +41,3 @@ index ba9321998a41..830e07b23a15 100644
 +	if (crtc_state ? crtc_state->base.active || crtc->state->active) {
  		struct intel_plane_state *old_state =
  			to_intel_plane_state(plane->state);
- 
-
-_______________________________________________
-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 ba8ce8c..316ead1 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -6,8 +6,9 @@
  "To\0Linus Torvalds <torvalds@linux-foundation.org>"
  " J\303\266rg Otte <jrg.otte@gmail.com>"
  " Daniel Vetter <daniel.vetter@ffwll.ch>\0"
- "Cc\0Linux Kernel Mailing List <linux-kernel@vger.kernel.org>"
- " DRI <dri-devel@lists.freedesktop.org>\0"
+ "Cc\0David 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"
  "Op 12-07-15 om 18:52 schreef Linus Torvalds:\n"
@@ -52,12 +53,6 @@
  "-\tif (crtc_state->base.active) {\n"
  "+\tif (crtc_state ? crtc_state->base.active || crtc->state->active) {\n"
  " \t\tstruct intel_plane_state *old_state =\n"
- " \t\t\tto_intel_plane_state(plane->state);\n"
- " \n"
- "\n"
- "_______________________________________________\n"
- "dri-devel mailing list\n"
- "dri-devel@lists.freedesktop.org\n"
- http://lists.freedesktop.org/mailman/listinfo/dri-devel
+ " \t\t\tto_intel_plane_state(plane->state);"
 
-f284684635383ece41ab1e9f5e1bdf13ff5b69ca0ccac2ae1476679ea0793de0
+ca469eb2a356d7b1967be0267e132af6311120f55d16e029093e5318bb2c1447
