diff for duplicates of <20150202175134.GB23909@dtor-ws>

diff --git a/a/1.txt b/N1/1.txt
index a59886e..54a0f5c 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -16,10 +16,10 @@ On Mon, Feb 02, 2015 at 05:05:39PM +0100, Markus Pargmann wrote:
 > > > >settings in the core driver and setup a idle configuration with touch
 > > > >detection.
 > > > >
-> > > >Signed-off-by: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
-> > > >Signed-off-by: Denis Carikli <denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org>
-> > > >Acked-by: Dmitry Torokhov <dtor-pghWNbHTmq7QT0dZR+AlfA@public.gmane.org>
-> > > >Signed-off-by: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
+> > > >Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
+> > > >Signed-off-by: Denis Carikli <denis@eukrea.com>
+> > > >Acked-by: Dmitry Torokhov <dtor@vmware.com>
+> > > >Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
 > > > >---
 > > > >  drivers/input/touchscreen/Kconfig         |   6 +
 > > > >  drivers/input/touchscreen/Makefile        |   1 +
@@ -67,7 +67,7 @@ your current sequence) after freeing irq by devm.
 By the way, I used my old @vmware address by accident. Can you please
 replace the original acked by with:
 
-Acked-by: Dmitry Torokhov <dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
+Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
 
 Thanks.
 
diff --git a/a/content_digest b/N1/content_digest
index 936237b..6680947 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -14,10 +14,7 @@
   "ref\00020150202160539.GS16879\@pengutronix.de\0"
 ]
 [
-  "ref\00020150202160539.GS16879-bIcnvbaLZ9MEGnE8C9+IrQ\@public.gmane.org\0"
-]
-[
-  "From\0Dmitry Torokhov <dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w\@public.gmane.org>\0"
+  "From\0Dmitry Torokhov <dmitry.torokhov\@gmail.com>\0"
 ]
 [
   "Subject\0Re: [PATCH v6 6/8] input: touchscreen: imx25 tcq driver\0"
@@ -26,30 +23,30 @@
   "Date\0Mon, 2 Feb 2015 09:51:34 -0800\0"
 ]
 [
-  "To\0Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ\@public.gmane.org>\0"
+  "To\0Markus Pargmann <mpa\@pengutronix.de>\0"
 ]
 [
-  "Cc\0Varka Bhadram <varkabhadram-Re5JQEeQqe8AvxtiuMwx3w\@public.gmane.org>",
-  " Shawn Guo <shawn.guo-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>",
-  " Samuel Ortiz <sameo-VuQAYsv1563Yd54FQh9/CA\@public.gmane.org>",
-  " Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org>",
-  " Fabio Estevam <festevam-Re5JQEeQqe8AvxtiuMwx3w\@public.gmane.org>",
-  " Peter Meerwald <pmeerw-jW+XmwGofnusTnJN9+BGXg\@public.gmane.org>",
-  " Hartmut Knaack <knaack.h-Mmb7MZpHnFY\@public.gmane.org>",
-  " Denis Carikli <denis-fO0SIAKYzcbQT0dZR+AlfA\@public.gmane.org>",
-  " Eric B\303\251nard <eric-fO0SIAKYzcbQT0dZR+AlfA\@public.gmane.org>",
-  " Sascha Hauer <kernel-bIcnvbaLZ9MEGnE8C9+IrQ\@public.gmane.org>",
-  " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org",
-  " Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>",
-  " linux-input-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
-  " linux-iio-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
-  " Lars-Peter Clausen <lars-Qo5EllUWu/uELgA04lAiVw\@public.gmane.org>",
-  " devicetree-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
-  " Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org>",
-  " Pawel Moll <pawel.moll-5wv7dgnIgG8\@public.gmane.org>",
-  " Mark Rutland <mark.rutland-5wv7dgnIgG8\@public.gmane.org>",
-  " Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg\@public.gmane.org>",
-  " Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ\@public.gmane.org>\0"
+  "Cc\0Varka Bhadram <varkabhadram\@gmail.com>",
+  " Shawn Guo <shawn.guo\@linaro.org>",
+  " Samuel Ortiz <sameo\@linux.intel.com>",
+  " Jonathan Cameron <jic23\@kernel.org>",
+  " Fabio Estevam <festevam\@gmail.com>",
+  " Peter Meerwald <pmeerw\@pmeerw.net>",
+  " Hartmut Knaack <knaack.h\@gmx.de>",
+  " Denis Carikli <denis\@eukrea.com>",
+  " Eric B\303\251nard <eric\@eukrea.com>",
+  " Sascha Hauer <kernel\@pengutronix.de>",
+  " linux-arm-kernel\@lists.infradead.org",
+  " Lee Jones <lee.jones\@linaro.org>",
+  " linux-input\@vger.kernel.org",
+  " linux-iio\@vger.kernel.org",
+  " Lars-Peter Clausen <lars\@metafoo.de>",
+  " devicetree\@vger.kernel.org",
+  " Rob Herring <robh+dt\@kernel.org>",
+  " Pawel Moll <pawel.moll\@arm.com>",
+  " Mark Rutland <mark.rutland\@arm.com>",
+  " Ian Campbell <ijc+devicetree\@hellion.org.uk>",
+  " Kumar Gala <galak\@codeaurora.org>\0"
 ]
 [
   "\0000:1\0"
@@ -76,10 +73,10 @@
   "> > > >settings in the core driver and setup a idle configuration with touch\n",
   "> > > >detection.\n",
   "> > > >\n",
-  "> > > >Signed-off-by: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ\@public.gmane.org>\n",
-  "> > > >Signed-off-by: Denis Carikli <denis-fO0SIAKYzcbQT0dZR+AlfA\@public.gmane.org>\n",
-  "> > > >Acked-by: Dmitry Torokhov <dtor-pghWNbHTmq7QT0dZR+AlfA\@public.gmane.org>\n",
-  "> > > >Signed-off-by: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ\@public.gmane.org>\n",
+  "> > > >Signed-off-by: Markus Pargmann <mpa\@pengutronix.de>\n",
+  "> > > >Signed-off-by: Denis Carikli <denis\@eukrea.com>\n",
+  "> > > >Acked-by: Dmitry Torokhov <dtor\@vmware.com>\n",
+  "> > > >Signed-off-by: Markus Pargmann <mpa\@pengutronix.de>\n",
   "> > > >---\n",
   "> > > >  drivers/input/touchscreen/Kconfig         |   6 +\n",
   "> > > >  drivers/input/touchscreen/Makefile        |   1 +\n",
@@ -127,7 +124,7 @@
   "By the way, I used my old \@vmware address by accident. Can you please\n",
   "replace the original acked by with:\n",
   "\n",
-  "Acked-by: Dmitry Torokhov <dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w\@public.gmane.org>\n",
+  "Acked-by: Dmitry Torokhov <dmitry.torokhov\@gmail.com>\n",
   "\n",
   "Thanks.\n",
   "\n",
@@ -135,4 +132,4 @@
   "Dmitry"
 ]
 
-3aec68c513b99f93c410e309eb11e55cb9387dfcf45772de694c064ca896bb52
+4749379c039baf0ab6d9877d40b7e5d86f8d8c7ec95cd7ecbbe3ddbb703ce644
