diff for duplicates of <20080506173248.23f1e591.akpm@linux-foundation.org>

diff --git a/a/1.txt b/N1/1.txt
index ed2cfc8..6e416f7 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -15,7 +15,7 @@ On Tue, 6 May 2008 15:38:13 -0700 "Darrick J. Wong" <djwong@us.ibm.com> wrote:
 > +++ b/Documentation/hwmon/ibmaem
 > @@ -0,0 +1,37 @@
 > +Kernel driver ibmaem
-> +===========
+> +======================
 > +
 > +Supported systems:
 > +  * Any recent IBM System X server with Active Energy Manager support.
@@ -304,14 +304,14 @@ unneeded and undesirable cast of void*.
 > +	int i, err; \
 > +\
 > +again: \
-> +	if (unlikely(idr_pre_get(&type##_idr, GFP_KERNEL) = 0)) \
+> +	if (unlikely(idr_pre_get(&type##_idr, GFP_KERNEL) == 0)) \
 > +		return -ENOMEM; \
 > +\
 > +	spin_lock(&type##_idr_lock); \
 > +	err = idr_get_new(&type##_idr, NULL, &i); \
 > +	spin_unlock(&type##_idr_lock); \
 > +\
-> +	if (unlikely(err = -EAGAIN)) \
+> +	if (unlikely(err == -EAGAIN)) \
 > +		goto again; \
 > +	else if (unlikely(err)) \
 > +		return err; \
@@ -697,10 +697,3 @@ platform_device_alloc() returns NULL on failure, not ERR_PTR.
 > +}
 
 ho hum.
-
-
-
-_______________________________________________
-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 3792002..f21b180 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -4,8 +4,8 @@
  "ref\020080506140433.0fa6e68e.akpm@linux-foundation.org\0"
  "ref\020080506223812.GF16404@tree.beaverton.ibm.com\0"
  "From\0Andrew Morton <akpm@linux-foundation.org>\0"
- "Subject\0Re: [lm-sensors] [resend] [PATCH v2] ibmaem: New driver for\0"
- "Date\0Wed, 07 May 2008 00:32:48 +0000\0"
+ "Subject\0Re: [resend] [PATCH v2] ibmaem: New driver for power/energy meters in IBM System X hardware\0"
+ "Date\0Tue, 6 May 2008 17:32:48 -0700\0"
  "To\0djwong@us.ibm.com\0"
  "Cc\0linux-kernel@vger.kernel.org"
   lm-sensors@lm-sensors.org
@@ -29,7 +29,7 @@
  "> +++ b/Documentation/hwmon/ibmaem\n"
  "> @@ -0,0 +1,37 @@\n"
  "> +Kernel driver ibmaem\n"
- "> +===========\n"
+ "> +======================\n"
  "> +\n"
  "> +Supported systems:\n"
  "> +  * Any recent IBM System X server with Active Energy Manager support.\n"
@@ -318,14 +318,14 @@
  "> +\tint i, err; \\\n"
  "> +\\\n"
  "> +again: \\\n"
- "> +\tif (unlikely(idr_pre_get(&type##_idr, GFP_KERNEL) = 0)) \\\n"
+ "> +\tif (unlikely(idr_pre_get(&type##_idr, GFP_KERNEL) == 0)) \\\n"
  "> +\t\treturn -ENOMEM; \\\n"
  "> +\\\n"
  "> +\tspin_lock(&type##_idr_lock); \\\n"
  "> +\terr = idr_get_new(&type##_idr, NULL, &i); \\\n"
  "> +\tspin_unlock(&type##_idr_lock); \\\n"
  "> +\\\n"
- "> +\tif (unlikely(err = -EAGAIN)) \\\n"
+ "> +\tif (unlikely(err == -EAGAIN)) \\\n"
  "> +\t\tgoto again; \\\n"
  "> +\telse if (unlikely(err)) \\\n"
  "> +\t\treturn err; \\\n"
@@ -710,13 +710,6 @@
  "> +\t\t\t   &sensor_dev_attr_name.dev_attr); \\\n"
  "> +}\n"
  "\n"
- "ho hum.\n"
- "\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "lm-sensors mailing list\n"
- "lm-sensors@lm-sensors.org\n"
- http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
+ ho hum.
 
-5ebf3ed5c8110b3f360cb3b79c29f9accc97d54e3e33c8242ee98170a3f62086
+50cfb66a88b739310d2aaf4e63e8e6a98b83ab98a4706fbe9df9e5f981ab7ef4
