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

diff --git a/a/1.txt b/N1/1.txt
index e6c67d6..cab6596 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -30,8 +30,3 @@ index 2c12b66..6f5beb3 100644
  	return 0;
 -- 
 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 09f99cf..9bda74d 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -6,13 +6,15 @@
  " 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>"
-  dri-devel@lists.freedesktop.org
-  linux-kernel@vger.kernel.org
-  Hans de Goede <hdegoede@redhat.com>
+ "Cc\0Lyude <cpaul@redhat.com>"
   stable@vger.kernel.org
   Daniel Vetter <daniel.vetter@intel.com>
- " Lyude <cpaul@redhat.com>\0"
+  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
+ " linux-kernel@vger.kernel.org\0"
  "\00:1\0"
  "b\0"
  "If we're enabling a pipe, we'll need to modify the watermarks on all\n"
@@ -46,11 +48,6 @@
  " \n"
  " \treturn 0;\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
 
-2e706eb2e67a0ccfac4b69a6689e9795ea3b76c8a2c8c3993487c8bd8e5cdd69
+2bfa6d0057015a453858fbf7cd91b1f00beb4bad197008bc93c53e842834dd14
