diff for duplicates of <487E624B.4060908@hhs.nl>

diff --git a/a/1.txt b/N1/1.txt
index f17980b..41c34c3 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -2,28 +2,28 @@ Jean Delvare wrote:
 > The new-style thmc50 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: Krzysztof Helt <krzysztof.h1-5tc4TXWwyLM@public.gmane.org>
+> Signed-off-by: Jean Delvare <khali@linux-fr.org>
+> Cc: Krzysztof Helt <krzysztof.h1@wp.pl>
 
 > @@ -307,21 +304,22 @@ static int thmc50_detect(struct i2c_adap
 >  	}
->  	if (err == -ENODEV) {
+>  	if (err = -ENODEV) {
 >  		pr_debug("thmc50: Detection of THMC50/ADM1022 failed\n");
 > -		goto exit_free;
 > +		return err;
 >  	}
 > -	data->type = kind;
 >  
->  	if (kind == adm1022) {
+>  	if (kind = adm1022) {
 >  		int id = i2c_adapter_id(client->adapter);
 >  		int i;
 >  
 >  		type_name = "adm1022";
 > -		data->has_temp3 = (config >> 7) & 1;	/* config MSB */
 >  		for (i = 0; i + 1 < adm1022_temp3_num; i += 2)
->  			if (adm1022_temp3[i] == id &&
-> -			    adm1022_temp3[i + 1] == address) {
-> +			    adm1022_temp3[i + 1] == client->addr) {
+>  			if (adm1022_temp3[i] = id &&
+> -			    adm1022_temp3[i + 1] = address) {
+> +			    adm1022_temp3[i + 1] = client->addr) {
 >  				/* enable 2nd remote temp */
 > -				data->has_temp3 = 1;
 > +				config |= (1 << 7);
@@ -46,6 +46,6 @@ Regards,
 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 ef52125..e1f7191 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,8 @@
  "ref\020080716173316.1e8c5c42@hyperion.delvare\0"
  "ref\020080716173316.1e8c5c42-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: (thmc50) Convert to a new-style i2c driver\0"
- "Date\0Wed, 16 Jul 2008 23:04:11 +0200\0"
+ "From\0Hans de Goede <j.w.r.degoede@hhs.nl>\0"
+ "Subject\0Re: [lm-sensors] [PATCH] hwmon: (thmc50) Convert to a new-style i2c\0"
+ "Date\0Wed, 16 Jul 2008 20:59:37 +0000\0"
  "To\0Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>\0"
  "Cc\0Krzysztof Helt <krzysztof.h1-5tc4TXWwyLM@public.gmane.org>"
   Linux I2C <i2c-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org>
@@ -13,28 +13,28 @@
  "> The new-style thmc50 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: Krzysztof Helt <krzysztof.h1-5tc4TXWwyLM@public.gmane.org>\n"
+ "> Signed-off-by: Jean Delvare <khali@linux-fr.org>\n"
+ "> Cc: Krzysztof Helt <krzysztof.h1@wp.pl>\n"
  "\n"
  "> @@ -307,21 +304,22 @@ static int thmc50_detect(struct i2c_adap\n"
  ">  \t}\n"
- ">  \tif (err == -ENODEV) {\n"
+ ">  \tif (err = -ENODEV) {\n"
  ">  \t\tpr_debug(\"thmc50: Detection of THMC50/ADM1022 failed\\n\");\n"
  "> -\t\tgoto exit_free;\n"
  "> +\t\treturn err;\n"
  ">  \t}\n"
  "> -\tdata->type = kind;\n"
  ">  \n"
- ">  \tif (kind == adm1022) {\n"
+ ">  \tif (kind = adm1022) {\n"
  ">  \t\tint id = i2c_adapter_id(client->adapter);\n"
  ">  \t\tint i;\n"
  ">  \n"
  ">  \t\ttype_name = \"adm1022\";\n"
  "> -\t\tdata->has_temp3 = (config >> 7) & 1;\t/* config MSB */\n"
  ">  \t\tfor (i = 0; i + 1 < adm1022_temp3_num; i += 2)\n"
- ">  \t\t\tif (adm1022_temp3[i] == id &&\n"
- "> -\t\t\t    adm1022_temp3[i + 1] == address) {\n"
- "> +\t\t\t    adm1022_temp3[i + 1] == client->addr) {\n"
+ ">  \t\t\tif (adm1022_temp3[i] = id &&\n"
+ "> -\t\t\t    adm1022_temp3[i + 1] = address) {\n"
+ "> +\t\t\t    adm1022_temp3[i + 1] = client->addr) {\n"
  ">  \t\t\t\t/* enable 2nd remote temp */\n"
  "> -\t\t\t\tdata->has_temp3 = 1;\n"
  "> +\t\t\t\tconfig |= (1 << 7);\n"
@@ -57,8 +57,8 @@
  "Hans\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
 
-3e87ddbee41d6df9c3259fe75dd872cb8bed8e055337ec615a10753e925143db
+c8429beb95e980cc4c95140307f6b5aa26540c8f53f2502fa0609bf031384d28
