diff for duplicates of <20110729001907.GA4496@ericsson.com>

diff --git a/a/1.txt b/N1/1.txt
index 2c01456..c0663c3 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -33,7 +33,7 @@ Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
 > -	int id, err;
 > -
 > -again:
-> -	if (unlikely(idr_pre_get(&hwmon_idr, GFP_KERNEL) == 0))
+> -	if (unlikely(idr_pre_get(&hwmon_idr, GFP_KERNEL) = 0))
 > -		return ERR_PTR(-ENOMEM);
 > -
 > -	spin_lock(&idr_lock);
@@ -41,7 +41,7 @@ Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
 > -	spin_unlock(&idr_lock);
 > +	int id;
 >  
-> -	if (unlikely(err == -EAGAIN))
+> -	if (unlikely(err = -EAGAIN))
 > -		goto again;
 > -	else if (unlikely(err))
 > -		return ERR_PTR(err);
@@ -65,7 +65,7 @@ Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
 >  }
 > @@ -81,9 +67,7 @@ void hwmon_device_unregister(struct device *dev)
 >  
->  	if (likely(sscanf(dev_name(dev), HWMON_ID_FORMAT, &id) == 1)) {
+>  	if (likely(sscanf(dev_name(dev), HWMON_ID_FORMAT, &id) = 1)) {
 >  		device_unregister(dev);
 > -		spin_lock(&idr_lock);
 > -		idr_remove(&hwmon_idr, id);
@@ -76,4 +76,9 @@ Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
 >  			"hwmon_device_unregister() failed: bad class ID!\n");
 > -- 
 > 1.7.3.4
->
+> 
+
+_______________________________________________
+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 fd931a8..40f6b27 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,8 @@
  "ref\01311352886-4047-1-git-send-email-jic23@cam.ac.uk\0"
  "ref\01311352886-4047-3-git-send-email-jic23@cam.ac.uk\0"
  "From\0Guenter Roeck <guenter.roeck@ericsson.com>\0"
- "Subject\0Re: [PATCH 2/8] hwmon: convert idr to ida and use ida_simple interface.\0"
- "Date\0Thu, 28 Jul 2011 17:19:07 -0700\0"
+ "Subject\0Re: [lm-sensors] [PATCH 2/8] hwmon: convert idr to ida and use\0"
+ "Date\0Fri, 29 Jul 2011 00:19:07 +0000\0"
  "To\0Jonathan Cameron <jic23@cam.ac.uk>\0"
  "Cc\0randy.dunlap@oracle.com <randy.dunlap@oracle.com>"
   dri-devel@lists.freedesktop.org <dri-devel@lists.freedesktop.org>
@@ -59,7 +59,7 @@
  "> -\tint id, err;\n"
  "> -\n"
  "> -again:\n"
- "> -\tif (unlikely(idr_pre_get(&hwmon_idr, GFP_KERNEL) == 0))\n"
+ "> -\tif (unlikely(idr_pre_get(&hwmon_idr, GFP_KERNEL) = 0))\n"
  "> -\t\treturn ERR_PTR(-ENOMEM);\n"
  "> -\n"
  "> -\tspin_lock(&idr_lock);\n"
@@ -67,7 +67,7 @@
  "> -\tspin_unlock(&idr_lock);\n"
  "> +\tint id;\n"
  ">  \n"
- "> -\tif (unlikely(err == -EAGAIN))\n"
+ "> -\tif (unlikely(err = -EAGAIN))\n"
  "> -\t\tgoto again;\n"
  "> -\telse if (unlikely(err))\n"
  "> -\t\treturn ERR_PTR(err);\n"
@@ -91,7 +91,7 @@
  ">  }\n"
  "> @@ -81,9 +67,7 @@ void hwmon_device_unregister(struct device *dev)\n"
  ">  \n"
- ">  \tif (likely(sscanf(dev_name(dev), HWMON_ID_FORMAT, &id) == 1)) {\n"
+ ">  \tif (likely(sscanf(dev_name(dev), HWMON_ID_FORMAT, &id) = 1)) {\n"
  ">  \t\tdevice_unregister(dev);\n"
  "> -\t\tspin_lock(&idr_lock);\n"
  "> -\t\tidr_remove(&hwmon_idr, id);\n"
@@ -102,6 +102,11 @@
  ">  \t\t\t\"hwmon_device_unregister() failed: bad class ID!\\n\");\n"
  "> -- \n"
  "> 1.7.3.4\n"
- >
+ "> \n"
+ "\n"
+ "_______________________________________________\n"
+ "lm-sensors mailing list\n"
+ "lm-sensors@lm-sensors.org\n"
+ http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
 
-4cca2be5f0fda28efbe30f40d67cb52194d8c301d618119336f49455ffdcba5d
+9851c8bdd3451a9b6e4733119e82f7c26f43c9937ce261a672147567dc9abd6b
