diff for duplicates of <20160301234535.419474625@linuxfoundation.org>

diff --git a/a/1.txt b/N1/1.txt
index 2688a76..406494f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -62,7 +62,3 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  		WARN_ON(drm_vblank_enable(dev, pipe));
  	spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
  }
-_______________________________________________
-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 2a30337..def9a69 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,17 +1,19 @@
  "ref\020160301234527.990448862@linuxfoundation.org\0"
  "From\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>\0"
  "Subject\0[PATCH 4.4 232/342] drm: Fix treatment of drm_vblank_offdelay in drm_vblank_on() (v2)\0"
- "Date\0Tue, 01 Mar 2016 23:55:01 +0000\0"
- "To\0linux-kernel@vger.kernel.org\0"
- "Cc\0dri-devel@lists.freedesktop.org"
-  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-  michel@daenzer.net
-  stable@vger.kernel.org
+ "Date\0Tue, 01 Mar 2016 23:55:00 +0000\0"
+ "To\0<linux-kernel@vger.kernel.org>\0"
+ "Cc\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
+  <stable@vger.kernel.org>
+  Mario Kleiner <mario.kleiner.de@gmail.com>
   Daniel Vetter <daniel.vetter@ffwll.ch>
-  alexander.deucher@amd.com
-  Dave Airlie <airlied@redhat.com>
-  christian.koenig@amd.com
- " vbabka@suse.cz\0"
+  <michel@daenzer.net>
+  <vbabka@suse.cz>
+  <ville.syrjala@linux.intel.com>
+  <dri-devel@lists.freedesktop.org>
+  <alexander.deucher@amd.com>
+  <christian.koenig@amd.com>
+ " Dave Airlie <airlied@redhat.com>\0"
  "\00:1\0"
  "b\0"
  "4.4-stable review patch.  If anyone has any objections, please let me know.\n"
@@ -77,10 +79,6 @@
  "+\tif (atomic_read(&vblank->refcount) != 0 || drm_vblank_offdelay == 0)\n"
  " \t\tWARN_ON(drm_vblank_enable(dev, pipe));\n"
  " \tspin_unlock_irqrestore(&dev->vbl_lock, irqflags);\n"
- " }\n"
- "_______________________________________________\n"
- "dri-devel mailing list\n"
- "dri-devel@lists.freedesktop.org\n"
- https://lists.freedesktop.org/mailman/listinfo/dri-devel
+  }
 
-aa8f2474a912ef443a6c49d805b39854f0b4eae73e792ee5485ff1c8e1eddd06
+b2ddccd8b6e02992f8eb539e5f2807e6ec2e0f88cf91608d5b15f683d3b45eeb
