diff for duplicates of <52BAB963.30707@redhat.com>

diff --git a/a/1.txt b/N1/1.txt
index 880776c..bafde8f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -8,7 +8,7 @@ On 12/25/2013 11:37 AM, Guenter Roeck wrote:
 >> the internal temperature sensor can be used to measure the SoC temperature
 >> independent of there actually being a touchscreen attached to the controller.
 >>
->> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
+>> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
 >
 > Hi Hans,
 
@@ -45,10 +45,10 @@ those, I'm a great fan of devm* so I'll use that one in my next revision.
 >> +++ b/drivers/input/touchscreen/sun4i-ts.c
 >> @@ -3,6 +3,9 @@
 >>    *
->>    * Copyright (C) 2013 - 2014 Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
+>>    * Copyright (C) 2013 - 2014 Hans de Goede <hdegoede@redhat.com>
 >>    *
 >> + * The hwmon parts are based on work by Corentin LABBE which is:
->> + * Copyright (C) 2013 Corentin LABBE <clabbe.montjoie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
+>> + * Copyright (C) 2013 Corentin LABBE <clabbe.montjoie@gmail.com>
 >> + *
 >>    * This program is free software; you can redistribute it and/or modify
 >>    * it under the terms of the GNU General Public License as published by
@@ -129,7 +129,7 @@ these things then me, tells me it is safe to turn it into a regular int.
 >> +
 >> +	temp_data = atomic_read(&ts->temp_data);
 >> +	/* No temp_data until the first irq */
->> +	if (temp_data == -1)
+>> +	if (temp_data = -1)
 >> +		return -EAGAIN;
 >> +
 >> +	return sprintf(buf, "%d\n", (temp_data - 1447) * 100);
@@ -238,3 +238,8 @@ Using it sounds like an excellent idea so I'll do that.
 Regards,
 
 Hans
+
+_______________________________________________
+lm-sensors mailing list
+lm-sensors@lm-sensors.org
+http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
diff --git a/a/content_digest b/N1/content_digest
index a8b09c4..8e6e3f7 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,9 +2,9 @@
  "ref\01387923847-1294-3-git-send-email-hdegoede@redhat.com\0"
  "ref\020131225103723.GA18256@roeck-us.net\0"
  "ref\020131225103723.GA18256-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org\0"
- "From\0Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\0"
- "Subject\0Re: Re: [lm-sensors] [PATCH 2/5] input: sun4i-ts: Add support for temperature sensor\0"
- "Date\0Wed, 25 Dec 2013 11:54:27 +0100\0"
+ "From\0Hans de Goede <hdegoede@redhat.com>\0"
+ "Subject\0Re: [lm-sensors] [linux-sunxi] Re: [PATCH 2/5] input: sun4i-ts: Add support for temperature sensor\0"
+ "Date\0Wed, 25 Dec 2013 10:54:27 +0000\0"
  "To\0linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org\0"
  "Cc\0Dmitry Torokhov <dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>"
   LM Sensors <lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org>
@@ -23,7 +23,7 @@
  ">> the internal temperature sensor can be used to measure the SoC temperature\n"
  ">> independent of there actually being a touchscreen attached to the controller.\n"
  ">>\n"
- ">> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n"
+ ">> Signed-off-by: Hans de Goede <hdegoede@redhat.com>\n"
  ">\n"
  "> Hi Hans,\n"
  "\n"
@@ -60,10 +60,10 @@
  ">> +++ b/drivers/input/touchscreen/sun4i-ts.c\n"
  ">> @@ -3,6 +3,9 @@\n"
  ">>    *\n"
- ">>    * Copyright (C) 2013 - 2014 Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n"
+ ">>    * Copyright (C) 2013 - 2014 Hans de Goede <hdegoede@redhat.com>\n"
  ">>    *\n"
  ">> + * The hwmon parts are based on work by Corentin LABBE which is:\n"
- ">> + * Copyright (C) 2013 Corentin LABBE <clabbe.montjoie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n"
+ ">> + * Copyright (C) 2013 Corentin LABBE <clabbe.montjoie@gmail.com>\n"
  ">> + *\n"
  ">>    * This program is free software; you can redistribute it and/or modify\n"
  ">>    * it under the terms of the GNU General Public License as published by\n"
@@ -144,7 +144,7 @@
  ">> +\n"
  ">> +\ttemp_data = atomic_read(&ts->temp_data);\n"
  ">> +\t/* No temp_data until the first irq */\n"
- ">> +\tif (temp_data == -1)\n"
+ ">> +\tif (temp_data = -1)\n"
  ">> +\t\treturn -EAGAIN;\n"
  ">> +\n"
  ">> +\treturn sprintf(buf, \"%d\\n\", (temp_data - 1447) * 100);\n"
@@ -252,6 +252,11 @@
  "\n"
  "Regards,\n"
  "\n"
- Hans
+ "Hans\n"
+ "\n"
+ "_______________________________________________\n"
+ "lm-sensors mailing list\n"
+ "lm-sensors@lm-sensors.org\n"
+ http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
 
-d0bc4d4d77808c8dffd1d84b86be67b387d70b8d3950dcf655813a73ebd3113b
+d283e9adfb4e078745f1db608690ccb4564e86309c5d6ab735e79fd19e230cba
