diff for duplicates of <20090806204255.GD14694@plum>

diff --git a/a/1.txt b/N1/1.txt
index 6525f67..165bc77 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -22,8 +22,7 @@ index 0000000..92f5f9c
 +++ b/Documentation/hwmon/acpi_power_meter
 @@ -0,0 +1,29 @@
 +Kernel driver power_meter
-+=========================
-+
++============+
 +This driver talks to ACPI 4.0 power meters.
 +
 +Supported systems:
@@ -491,7 +490,7 @@ index 0000000..3f48dec
 +		val = resource->caps.max_cap * 1000;
 +		break;
 +	case 4:
-+		if (resource->caps.hysteresis == UNKNOWN_HYSTERESIS)
++		if (resource->caps.hysteresis = UNKNOWN_HYSTERESIS)
 +			return sprintf(buf, "unknown\n");
 +
 +		val = resource->caps.hysteresis * 1000;
@@ -692,8 +691,7 @@ index 0000000..3f48dec
 +			     struct ro_sensor_template *ro)
 +{
 +	struct device *dev = &resource->acpi_dev->dev;
-+	struct sensor_device_attribute *sensors =
-+		&resource->sensors[resource->num_sensors];
++	struct sensor_device_attribute *sensors +		&resource->sensors[resource->num_sensors];
 +	int res;
 +
 +	while (ro->label) {
@@ -720,8 +718,7 @@ index 0000000..3f48dec
 +			     struct rw_sensor_template *rw)
 +{
 +	struct device *dev = &resource->acpi_dev->dev;
-+	struct sensor_device_attribute *sensors =
-+		&resource->sensors[resource->num_sensors];
++	struct sensor_device_attribute *sensors +		&resource->sensors[resource->num_sensors];
 +	int res;
 +
 +	while (rw->label) {
@@ -1059,3 +1056,8 @@ index 0000000..3f48dec
 +
 +module_init(acpi_power_meter_init);
 +module_exit(acpi_power_meter_exit);
+
+_______________________________________________
+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 696d8df..13cde12 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -3,8 +3,8 @@
  "ref\0alpine.LFD.2.00.0907272124110.4445@localhost.localdomain\0"
  "ref\020090803205812.GC14694@plum\0"
  "From\0Darrick J. Wong <djwong@us.ibm.com>\0"
- "Subject\0[PATCH v2] acpi_power_meter: hwmon driver for ACPI 4.0 power meters\0"
- "Date\0Thu, 6 Aug 2009 13:42:57 -0700\0"
+ "Subject\0[lm-sensors] [PATCH v2] acpi_power_meter: hwmon driver for ACPI 4.0\0"
+ "Date\0Thu, 06 Aug 2009 20:42:57 +0000\0"
  "To\0Len Brown <lenb@kernel.org>\0"
  "Cc\0linux-acpi <linux-acpi@vger.kernel.org>"
   Andrew Morton <akpm@linux-foundation.org>
@@ -37,8 +37,7 @@
  "+++ b/Documentation/hwmon/acpi_power_meter\n"
  "@@ -0,0 +1,29 @@\n"
  "+Kernel driver power_meter\n"
- "+=========================\n"
- "+\n"
+ "+============+\n"
  "+This driver talks to ACPI 4.0 power meters.\n"
  "+\n"
  "+Supported systems:\n"
@@ -506,7 +505,7 @@
  "+\t\tval = resource->caps.max_cap * 1000;\n"
  "+\t\tbreak;\n"
  "+\tcase 4:\n"
- "+\t\tif (resource->caps.hysteresis == UNKNOWN_HYSTERESIS)\n"
+ "+\t\tif (resource->caps.hysteresis = UNKNOWN_HYSTERESIS)\n"
  "+\t\t\treturn sprintf(buf, \"unknown\\n\");\n"
  "+\n"
  "+\t\tval = resource->caps.hysteresis * 1000;\n"
@@ -707,8 +706,7 @@
  "+\t\t\t     struct ro_sensor_template *ro)\n"
  "+{\n"
  "+\tstruct device *dev = &resource->acpi_dev->dev;\n"
- "+\tstruct sensor_device_attribute *sensors =\n"
- "+\t\t&resource->sensors[resource->num_sensors];\n"
+ "+\tstruct sensor_device_attribute *sensors +\t\t&resource->sensors[resource->num_sensors];\n"
  "+\tint res;\n"
  "+\n"
  "+\twhile (ro->label) {\n"
@@ -735,8 +733,7 @@
  "+\t\t\t     struct rw_sensor_template *rw)\n"
  "+{\n"
  "+\tstruct device *dev = &resource->acpi_dev->dev;\n"
- "+\tstruct sensor_device_attribute *sensors =\n"
- "+\t\t&resource->sensors[resource->num_sensors];\n"
+ "+\tstruct sensor_device_attribute *sensors +\t\t&resource->sensors[resource->num_sensors];\n"
  "+\tint res;\n"
  "+\n"
  "+\twhile (rw->label) {\n"
@@ -1073,6 +1070,11 @@
  "+MODULE_LICENSE(\"GPL\");\n"
  "+\n"
  "+module_init(acpi_power_meter_init);\n"
- +module_exit(acpi_power_meter_exit);
+ "+module_exit(acpi_power_meter_exit);\n"
+ "\n"
+ "_______________________________________________\n"
+ "lm-sensors mailing list\n"
+ "lm-sensors@lm-sensors.org\n"
+ http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
 
-04d4496b98c48b33f5acd37f1911e0bfc924ef4e2dc041d8811f860c10279fbe
+308e73dcda1830ef971ae94bcafed0ab31a05d82ce454534bc91ee06160b4cc6
