diff for duplicates of <20150731194007.355617982@linuxfoundation.org>

diff --git a/a/1.txt b/N1/1.txt
index 5c7c7a2..f267d3b 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -119,9 +119,3 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  };
  
  /**
-
-
-_______________________________________________
-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 9061165..1e66f82 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -3,12 +3,13 @@
  "Subject\0[PATCH 4.1 162/267] drm: Provide compat ioctl for addfb2.1\0"
  "Date\0Fri, 31 Jul 2015 12:40:13 -0700\0"
  "To\0linux-kernel@vger.kernel.org\0"
- "Cc\0Daniel Stone <daniels@collabora.com>"
+ "Cc\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
+  stable@vger.kernel.org
   Tvrtko Ursulin <tvrtko.ursulin@intel.com>
   Daniel Vetter <daniel.vetter@ffwll.ch>
   dri-devel@lists.freedesktop.org
-  stable@vger.kernel.org
-  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+  Rob Clark <robdclark@gmail.com>
+  Daniel Stone <daniels@collabora.com>
  " Daniel Vetter <daniel.vetter@intel.com>\0"
  "\00:1\0"
  "b\0"
@@ -132,12 +133,6 @@
  "+\t[DRM_IOCTL_NR(DRM_IOCTL_MODE_ADDFB232)] = compat_drm_mode_addfb2,\n"
  " };\n"
  " \n"
- " /**\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "dri-devel mailing list\n"
- "dri-devel@lists.freedesktop.org\n"
- http://lists.freedesktop.org/mailman/listinfo/dri-devel
+  /**
 
-5928b8334abe226bb64eb4f961db9be2ae3f8b02d6e0b359df1245124da199c7
+234536bcda33b08f124a424ce53b6db9e0ca3513027739067c48990be9fcd652
