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

diff --git a/a/1.txt b/N1/1.txt
index 70e7fe8..8292f6e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -609,8 +609,3 @@ index 6f5beb3..636c90a 100644
  	 * Store the new configuration (but only for the pipes that have
 -- 
 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 457c229..8845505 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\0Radhakrishna Sripada <radhakrishna.sripada@intel.com>"
-  linux-kernel@vger.kernel.org
+ "Cc\0Lyude <cpaul@redhat.com>"
+  Daniel Vetter <daniel.vetter@intel.com>
+  Radhakrishna Sripada <radhakrishna.sripada@intel.com>
   Hans de Goede <hdegoede@redhat.com>
+  Jani Nikula <jani.nikula@linux.intel.com>
+  David Airlie <airlied@linux.ie>
   dri-devel@lists.freedesktop.org
-  Daniel Vetter <daniel.vetter@intel.com>
- " Lyude <cpaul@redhat.com>\0"
+ " linux-kernel@vger.kernel.org\0"
  "\00:1\0"
  "b\0"
  "Now that we can hook into update_crtcs and control the order in which we\n"
@@ -624,11 +626,6 @@
  " \t/*\n"
  " \t * Store the new configuration (but only for the pipes that have\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
 
-1e8c3cc50e7c2c59332631b4c9042c18efa7cc81a66c673ff063b77dce5ea4cc
+173ba49414823f94649476fdb2752de8550e039806b0f0efb3f06ca48bb4e5df
