diff for duplicates of <487E637C.2020404@hhs.nl>

diff --git a/a/1.txt b/N1/1.txt
index 8ad997f..768f19b 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -2,12 +2,12 @@ Jean Delvare wrote:
 > The new-style w83791d 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: Marc Hulsman <m.hulsman-hGVxb2UgFK3z+pZb47iToQ@public.gmane.org>
+> Signed-off-by: Jean Delvare <khali@linux-fr.org>
+> Cc: Marc Hulsman <m.hulsman@tudelft.nl>
 
 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,
 
@@ -91,8 +91,7 @@ Hans
 > -	int err;
 > -	struct i2c_client *sub_client;
 > -
-> -	(*sub_cli) = sub_client =
-> -			kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
+> -	(*sub_cli) = sub_client > -			kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
 > -	if (!(sub_client)) {
 > -		return -ENOMEM;
 > -	}
@@ -238,10 +237,10 @@ Hans
 > +			return -ENODEV;
 >  		}
 >  		val1 = w83791d_read(client, W83791D_REG_WCHIPID);
->  		if (val1 == 0x71) {
+>  		if (val1 = 0x71) {
 >  			kind = w83791d;
 >  		} else {
->  			if (kind == 0)
+>  			if (kind = 0)
 > -				dev_warn(dev,
 > +				dev_warn(&adapter->dev,
 >  					"w83791d: Ignoring 'force' parameter "
@@ -253,7 +252,7 @@ Hans
 >  		}
 >  	}
 >  
-> -	if (kind == w83791d) {
+> -	if (kind = w83791d) {
 > -		client_name = "w83791d";
 > -	} else {
 > -		dev_err(dev, "w83791d: Internal error: unknown kind (%d)?!?\n",
@@ -361,6 +360,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 3809415..c24d8bc 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,8 @@
  "ref\020080716173419.10c135b6@hyperion.delvare\0"
  "ref\020080716173419.10c135b6-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: (w83791d) Convert to a new-style i2c\tdriver\0"
- "Date\0Wed, 16 Jul 2008 23:09:16 +0200\0"
+ "From\0Hans de Goede <j.w.r.degoede@hhs.nl>\0"
+ "Subject\0Re: [lm-sensors] [PATCH] hwmon: (w83791d) Convert to a new-style\0"
+ "Date\0Wed, 16 Jul 2008 21:09:16 +0000\0"
  "To\0Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>\0"
  "Cc\0Linux I2C <i2c-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org>"
  " LM Sensors <lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org>\0"
@@ -12,12 +12,12 @@
  "> The new-style w83791d driver implements the optional detect()\n"
  "> callback to cover the use cases of the legacy driver.\n"
  "> \n"
- "> Signed-off-by: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>\n"
- "> Cc: Marc Hulsman <m.hulsman-hGVxb2UgFK3z+pZb47iToQ@public.gmane.org>\n"
+ "> Signed-off-by: Jean Delvare <khali@linux-fr.org>\n"
+ "> Cc: Marc Hulsman <m.hulsman@tudelft.nl>\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"
@@ -101,8 +101,7 @@
  "> -\tint err;\n"
  "> -\tstruct i2c_client *sub_client;\n"
  "> -\n"
- "> -\t(*sub_cli) = sub_client =\n"
- "> -\t\t\tkzalloc(sizeof(struct i2c_client), GFP_KERNEL);\n"
+ "> -\t(*sub_cli) = sub_client > -\t\t\tkzalloc(sizeof(struct i2c_client), GFP_KERNEL);\n"
  "> -\tif (!(sub_client)) {\n"
  "> -\t\treturn -ENOMEM;\n"
  "> -\t}\n"
@@ -248,10 +247,10 @@
  "> +\t\t\treturn -ENODEV;\n"
  ">  \t\t}\n"
  ">  \t\tval1 = w83791d_read(client, W83791D_REG_WCHIPID);\n"
- ">  \t\tif (val1 == 0x71) {\n"
+ ">  \t\tif (val1 = 0x71) {\n"
  ">  \t\t\tkind = w83791d;\n"
  ">  \t\t} else {\n"
- ">  \t\t\tif (kind == 0)\n"
+ ">  \t\t\tif (kind = 0)\n"
  "> -\t\t\t\tdev_warn(dev,\n"
  "> +\t\t\t\tdev_warn(&adapter->dev,\n"
  ">  \t\t\t\t\t\"w83791d: Ignoring 'force' parameter \"\n"
@@ -263,7 +262,7 @@
  ">  \t\t}\n"
  ">  \t}\n"
  ">  \n"
- "> -\tif (kind == w83791d) {\n"
+ "> -\tif (kind = w83791d) {\n"
  "> -\t\tclient_name = \"w83791d\";\n"
  "> -\t} else {\n"
  "> -\t\tdev_err(dev, \"w83791d: Internal error: unknown kind (%d)?!?\\n\",\n"
@@ -371,8 +370,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
 
-d533c879b3eac0d278ae88dde4b97852dec9fb0b14660e2aa816b32d0d8718bf
+6a16eea99ec88f96b1a4b3620ac63a55d40ad99c6511f2c0b5afdeee066125da
