diff for duplicates of <1470177458-31984-2-git-send-email-cpaul@redhat.com>

diff --git a/a/1.txt b/N1/1.txt
index 33cc0e3..470ffa9 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -272,8 +272,3 @@ index f610b71..68721a5 100644
  static void ilk_pipe_wm_get_hw_state(struct drm_crtc *crtc)
 -- 
 2.7.4
-
-_______________________________________________
-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 d693886..5a1f824 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -6,12 +6,14 @@
  " Ville Syrj\303\244l\303\244 <ville.syrjala@linux.intel.com>"
   Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
  " Matt Roper <matthew.d.roper@intel.com>\0"
- "Cc\0Daniel Vetter <daniel.vetter@ffwll.ch>"
-  dri-devel@lists.freedesktop.org
-  linux-kernel@vger.kernel.org
+ "Cc\0Lyude <cpaul@redhat.com>"
+  Daniel Vetter <daniel.vetter@ffwll.ch>
   stable@vger.kernel.org
   Daniel Vetter <daniel.vetter@intel.com>
- " Lyude <cpaul@redhat.com>\0"
+  Jani Nikula <jani.nikula@linux.intel.com>
+  David Airlie <airlied@linux.ie>
+  dri-devel@lists.freedesktop.org
+ " linux-kernel@vger.kernel.org\0"
  "\00:1\0"
  "b\0"
  "Since the watermark calculations for Skylake are still broken, we're apt\n"
@@ -287,11 +289,6 @@
  " \n"
  " static void ilk_pipe_wm_get_hw_state(struct drm_crtc *crtc)\n"
  "-- \n"
- "2.7.4\n"
- "\n"
- "_______________________________________________\n"
- "dri-devel mailing list\n"
- "dri-devel@lists.freedesktop.org\n"
- https://lists.freedesktop.org/mailman/listinfo/dri-devel
+ 2.7.4
 
-04f19f3734eaabfb182fac6cd5583c96c6c5b2acbc3c0eadec4f30a4c4d4abf5
+63d394314b49957202026011ed505c6cce7dd1b5a1b8ca87e41afa18aa211769
