diff for duplicates of <20180824102843.666bc465@bbrezillon>

diff --git a/a/1.txt b/N1/1.txt
index a11fb8b..4557f1e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -32,7 +32,7 @@ Sam Ravnborg <sam@ravnborg.org> wrote:
 > +++ b/MAINTAINERS
 > @@ -4681,7 +4681,7 @@ DRM DRIVERS FOR ATMEL HLCDC
 >  M:	Boris Brezillon <boris.brezillon@bootlin.com>
->  L:	dri-devel@lists.freedesktop.org
+>  L:	dri-devel at lists.freedesktop.org
 >  S:	Supported
 > -F:	drivers/gpu/drm/atmel-hlcdc/
 > +F:	drivers/gpu/drm/atmel/atmel-hlcdc*
@@ -120,8 +120,3 @@ selected by DRM_ATMEL_HLCDC and DRM_ATMEL_LCDC.
 > similarity index 100%
 > rename from drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
 > rename to drivers/gpu/drm/atmel/atmel_hlcdc_plane.c
-
-_______________________________________________
-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 00e87d8..78f1cce 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,18 +1,9 @@
  "ref\020180812184152.GA22343@ravnborg.org\0"
  "ref\020180812184629.3808-1-sam@ravnborg.org\0"
- "From\0Boris Brezillon <boris.brezillon@bootlin.com>\0"
- "Subject\0Re: [PATCH v1 1/7] atmel-hlcdc: renamed directory to drm/atmel/\0"
+ "From\0boris.brezillon@bootlin.com (Boris Brezillon)\0"
+ "Subject\0[PATCH v1 1/7] atmel-hlcdc: renamed directory to drm/atmel/\0"
  "Date\0Fri, 24 Aug 2018 10:28:43 +0200\0"
- "To\0Sam Ravnborg <sam@ravnborg.org>\0"
- "Cc\0Mark Rutland <mark.rutland@arm.com>"
-  devicetree@vger.kernel.org
-  Alexandre Belloni <alexandre.belloni@bootlin.com>
-  linux-pwm@vger.kernel.org
-  Nicolas Ferre <nicolas.ferre@microchip.com>
-  dri-devel@lists.freedesktop.org
-  Rob Herring <robh+dt@kernel.org>
-  Lee Jones <lee.jones@linaro.org>
- " linux-arm-kernel@lists.infradead.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Sun, 12 Aug 2018 20:46:23 +0200\n"
@@ -49,7 +40,7 @@
  "> +++ b/MAINTAINERS\n"
  "> @@ -4681,7 +4681,7 @@ DRM DRIVERS FOR ATMEL HLCDC\n"
  ">  M:\tBoris Brezillon <boris.brezillon@bootlin.com>\n"
- ">  L:\tdri-devel@lists.freedesktop.org\n"
+ ">  L:\tdri-devel at lists.freedesktop.org\n"
  ">  S:\tSupported\n"
  "> -F:\tdrivers/gpu/drm/atmel-hlcdc/\n"
  "> +F:\tdrivers/gpu/drm/atmel/atmel-hlcdc*\n"
@@ -136,11 +127,6 @@
  "> diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c b/drivers/gpu/drm/atmel/atmel_hlcdc_plane.c\n"
  "> similarity index 100%\n"
  "> rename from drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c\n"
- "> rename to drivers/gpu/drm/atmel/atmel_hlcdc_plane.c\n"
- "\n"
- "_______________________________________________\n"
- "dri-devel mailing list\n"
- "dri-devel@lists.freedesktop.org\n"
- https://lists.freedesktop.org/mailman/listinfo/dri-devel
+ > rename to drivers/gpu/drm/atmel/atmel_hlcdc_plane.c
 
-f23d5890283c377b2e1ab04936397355fda6294df18f9724c7500b033daade7b
+75b41add21e5dc58283b72619944d4e0ea87aa71b7883612414d29ac50e05e52
