diff for duplicates of <487E629F.8040804@hhs.nl>

diff --git a/a/1.txt b/N1/1.txt
index 193a616..95f1108 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -2,12 +2,12 @@ Jean Delvare wrote:
 > The new-style lm87 driver implements the optional detect() callback
 > to cover the use cases of the legacy driver.
 > 
-> Signed-off-by: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>
-> Cc: Ben Hutchings <bhutchings-s/n/eUQHGBpZroRs9YW3xA@public.gmane.org>
+> Signed-off-by: Jean Delvare <khali@linux-fr.org>
+> Cc: Ben Hutchings <bhutchings@solarflare.com>
 
 Looks good,
 
-Acked-by: Hans de Goede <j.w.r.degoede-fbo2DhPpy/Q@public.gmane.org>
+Acked-by: Hans de Goede <j.w.r.degoede@hhs.nl>
 
 Regards,
 
@@ -21,11 +21,11 @@ Hans
 > --- linux-2.6.26-rc9.orig/drivers/hwmon/lm87.c	2008-07-12 09:20:29.000000000 +0200
 > +++ linux-2.6.26-rc9/drivers/hwmon/lm87.c	2008-07-12 10:27:17.000000000 +0200
 > @@ -5,7 +5,7 @@
->   *                          Philip Edelbrock <phil-KXOFo5pg7o1l57MIdRCFDg@public.gmane.org>
->   *                          Stephen Rousset <stephen.rousset-RtyX3GHucphnQYSypqKXDg@public.gmane.org>
->   *                          Dan Eaton <dan.eaton-RtyX3GHucphnQYSypqKXDg@public.gmane.org>
-> - * Copyright (C) 2004,2007  Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>
-> + * Copyright (C) 2004-2008  Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>
+>   *                          Philip Edelbrock <phil@netroedge.com>
+>   *                          Stephen Rousset <stephen.rousset@rocketlogix.com>
+>   *                          Dan Eaton <dan.eaton@rocketlogix.com>
+> - * Copyright (C) 2004,2007  Jean Delvare <khali@linux-fr.org>
+> + * Copyright (C) 2004-2008  Jean Delvare <khali@linux-fr.org>
 >   *
 >   * Original port to Linux 2.6 by Jeff Oliver.
 >   *
@@ -130,7 +130,7 @@ Hans
 > +		return -ENODEV;
 >  
 >  	/* Default to an LM87 if forced */
->  	if (kind == 0)
+>  	if (kind = 0)
 > @@ -704,20 +691,32 @@ static int lm87_detect(struct i2c_adapte
 >  		 || (lm87_read_value(new_client, LM87_REG_CONFIG) & 0x80)) {
 >  			dev_dbg(&adapter->dev,
@@ -215,6 +215,6 @@ Hans
 
 
 _______________________________________________
-i2c mailing list
-i2c-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org
-http://lists.lm-sensors.org/mailman/listinfo/i2c
+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 61181ff..b378660 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,8 @@
  "ref\020080716164128.46f6766e@hyperion.delvare\0"
  "ref\020080716164128.46f6766e-ig7AzVSIIG7kN2dkZ6Wm7A@public.gmane.org\0"
- "From\0Hans de Goede <j.w.r.degoede-fbo2DhPpy/Q@public.gmane.org>\0"
- "Subject\0Re: [lm-sensors] [PATCH] hwmon: (lm87) Convert to a new-style i2c driver\0"
- "Date\0Wed, 16 Jul 2008 23:05:35 +0200\0"
+ "From\0Hans de Goede <j.w.r.degoede@hhs.nl>\0"
+ "Subject\0Re: [lm-sensors] [PATCH] hwmon: (lm87) Convert to a new-style i2c\0"
+ "Date\0Wed, 16 Jul 2008 20:59:44 +0000\0"
  "To\0Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>\0"
  "Cc\0Ben Hutchings <bhutchings-s/n/eUQHGBpZroRs9YW3xA@public.gmane.org>"
   Linux I2C <i2c-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org>
@@ -13,12 +13,12 @@
  "> The new-style lm87 driver implements the optional detect() callback\n"
  "> to cover the use cases of the legacy driver.\n"
  "> \n"
- "> Signed-off-by: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>\n"
- "> Cc: Ben Hutchings <bhutchings-s/n/eUQHGBpZroRs9YW3xA@public.gmane.org>\n"
+ "> Signed-off-by: Jean Delvare <khali@linux-fr.org>\n"
+ "> Cc: Ben Hutchings <bhutchings@solarflare.com>\n"
  "\n"
  "Looks good,\n"
  "\n"
- "Acked-by: Hans de Goede <j.w.r.degoede-fbo2DhPpy/Q@public.gmane.org>\n"
+ "Acked-by: Hans de Goede <j.w.r.degoede@hhs.nl>\n"
  "\n"
  "Regards,\n"
  "\n"
@@ -32,11 +32,11 @@
  "> --- linux-2.6.26-rc9.orig/drivers/hwmon/lm87.c\t2008-07-12 09:20:29.000000000 +0200\n"
  "> +++ linux-2.6.26-rc9/drivers/hwmon/lm87.c\t2008-07-12 10:27:17.000000000 +0200\n"
  "> @@ -5,7 +5,7 @@\n"
- ">   *                          Philip Edelbrock <phil-KXOFo5pg7o1l57MIdRCFDg@public.gmane.org>\n"
- ">   *                          Stephen Rousset <stephen.rousset-RtyX3GHucphnQYSypqKXDg@public.gmane.org>\n"
- ">   *                          Dan Eaton <dan.eaton-RtyX3GHucphnQYSypqKXDg@public.gmane.org>\n"
- "> - * Copyright (C) 2004,2007  Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>\n"
- "> + * Copyright (C) 2004-2008  Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>\n"
+ ">   *                          Philip Edelbrock <phil@netroedge.com>\n"
+ ">   *                          Stephen Rousset <stephen.rousset@rocketlogix.com>\n"
+ ">   *                          Dan Eaton <dan.eaton@rocketlogix.com>\n"
+ "> - * Copyright (C) 2004,2007  Jean Delvare <khali@linux-fr.org>\n"
+ "> + * Copyright (C) 2004-2008  Jean Delvare <khali@linux-fr.org>\n"
  ">   *\n"
  ">   * Original port to Linux 2.6 by Jeff Oliver.\n"
  ">   *\n"
@@ -141,7 +141,7 @@
  "> +\t\treturn -ENODEV;\n"
  ">  \n"
  ">  \t/* Default to an LM87 if forced */\n"
- ">  \tif (kind == 0)\n"
+ ">  \tif (kind = 0)\n"
  "> @@ -704,20 +691,32 @@ static int lm87_detect(struct i2c_adapte\n"
  ">  \t\t || (lm87_read_value(new_client, LM87_REG_CONFIG) & 0x80)) {\n"
  ">  \t\t\tdev_dbg(&adapter->dev,\n"
@@ -226,8 +226,8 @@
  "\n"
  "\n"
  "_______________________________________________\n"
- "i2c mailing list\n"
- "i2c-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org\n"
- http://lists.lm-sensors.org/mailman/listinfo/i2c
+ "lm-sensors mailing list\n"
+ "lm-sensors@lm-sensors.org\n"
+ http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
 
-98f777486429f9edc9bbde30f7a10a3df264d6a30a9bee64bf52367961897e16
+1b7c878b48204fc042585be666605c4eb1cff75dde16ae8372d7431c6270470d
