diff for duplicates of <5240C145.6080104@linux.intel.com>

diff --git a/a/1.txt b/N1/1.txt
index 2514c29..a4cf0cc 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -476,8 +476,7 @@ an uniform sysfs interface.
 > +		err = rdmsr_safe_on_cpu(cpu, power_info_msr[d], &eax, &edx);
 > +		if (err)
 > +			continue;
-> +		tdata->rapl_power_max[d] =
-> +			((eax & 0x7fff) * 1000) >> tdata->rapl_power_units;
+> +		tdata->rapl_power_max[d] > +			((eax & 0x7fff) * 1000) >> tdata->rapl_power_units;
 > +		tdata->rapl_attr_mask[d] |= BIT(4);
 > +	}
 > +}
@@ -585,3 +584,9 @@ an uniform sysfs interface.
 >   	},
 >   	.probe = coretemp_probe,
 >   	.remove = coretemp_remove,
+
+
+_______________________________________________
+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 fccbd9b..345c8b4 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,8 @@
  "ref\01379968489-13781-1-git-send-email-linux@roeck-us.net\0"
  "ref\01379968489-13781-2-git-send-email-linux@roeck-us.net\0"
  "From\0Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>\0"
- "Subject\0Re: [PATCH v5 2/2] hwmon: (coretemp) Report power and energy consumption\0"
- "Date\0Mon, 23 Sep 2013 15:31:33 -0700\0"
+ "Subject\0Re: [lm-sensors] [PATCH v5 2/2] hwmon: (coretemp) Report power and energy consumption\0"
+ "Date\0Mon, 23 Sep 2013 22:31:33 +0000\0"
  "To\0Guenter Roeck <linux@roeck-us.net>\0"
  "Cc\0Jean Delvare <khali@linux-fr.org>"
   Fenghua Yu <fenghua.yu@intel.com>
@@ -490,8 +490,7 @@
  "> +\t\terr = rdmsr_safe_on_cpu(cpu, power_info_msr[d], &eax, &edx);\n"
  "> +\t\tif (err)\n"
  "> +\t\t\tcontinue;\n"
- "> +\t\ttdata->rapl_power_max[d] =\n"
- "> +\t\t\t((eax & 0x7fff) * 1000) >> tdata->rapl_power_units;\n"
+ "> +\t\ttdata->rapl_power_max[d] > +\t\t\t((eax & 0x7fff) * 1000) >> tdata->rapl_power_units;\n"
  "> +\t\ttdata->rapl_attr_mask[d] |= BIT(4);\n"
  "> +\t}\n"
  "> +}\n"
@@ -598,6 +597,12 @@
  "> +\t\t.pm = CORETEMP_DEV_PM_OPS,\n"
  ">   \t},\n"
  ">   \t.probe = coretemp_probe,\n"
- ">   \t.remove = coretemp_remove,"
+ ">   \t.remove = coretemp_remove,\n"
+ "\n"
+ "\n"
+ "_______________________________________________\n"
+ "lm-sensors mailing list\n"
+ "lm-sensors@lm-sensors.org\n"
+ http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
 
-bf7eea7b839029ba379cb2cf09cc117287c940e0b7a38e2df98b9ad6c1dfe17e
+9527e9a4cb49674adb667d218851372666c5c872e9f60aad782f498b26d1354a
