diff for duplicates of <20110819021333.GA27544@ericsson.com>

diff --git a/a/1.txt b/N1/1.txt
index 7fa48bb..5a25656 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -45,7 +45,7 @@ Guenter
 > +++ b/Documentation/hwmon/omap_temp_sensor
 > @@ -0,0 +1,27 @@
 > +Kernel driver omap_temp_sensor
-> +==============================
+> +===============
 > +
 > +Supported chips:
 > +  * Texas Instruments OMAP4460
@@ -817,7 +817,7 @@ Guenter
 > +       }
 > +
 > +       clk_rate = clk_round_rate(temp_sensor->clock, 2000000);
-> +       if (clk_rate < 1000000 || clk_rate == 0xffffffff) {
+> +       if (clk_rate < 1000000 || clk_rate = 0xffffffff) {
 > +               dev_err(&pdev->dev, "Error round rate\n");
 > +               ret = -EINVAL;
 > +               goto clken_err;
@@ -926,8 +926,7 @@ Guenter
 > +               temp_sensor->registers->bgap_counter);
 > +       temp_sensor->bg_threshold = omap_temp_sensor_readl(temp_sensor,
 > +               temp_sensor->registers->bgap_threshold);
-> +       temp_sensor->temp_sensor_tshut_threshold =
-> +               omap_temp_sensor_readl(temp_sensor,
+> +       temp_sensor->temp_sensor_tshut_threshold > +               omap_temp_sensor_readl(temp_sensor,
 > +               temp_sensor->registers->thsut_threshold);
 > +}
 > +
@@ -1031,4 +1030,9 @@ Guenter
 > +MODULE_AUTHOR("J Keerthy <j-keerthy@ti.com>");
 > --
 > 1.7.0.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 7a54b92..d2c311a 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,8 @@
  "ref\01313664735-8917-1-git-send-email-j-keerthy@ti.com\0"
  "ref\01313664735-8917-7-git-send-email-j-keerthy@ti.com\0"
  "From\0Guenter Roeck <guenter.roeck@ericsson.com>\0"
- "Subject\0Re: [RFC PATCH 6/6 V2] hwmon: OMAP4: On die temperature sensor driver\0"
- "Date\0Thu, 18 Aug 2011 19:13:33 -0700\0"
+ "Subject\0Re: [lm-sensors] [RFC PATCH 6/6 V2] hwmon: OMAP4: On die\0"
+ "Date\0Fri, 19 Aug 2011 02:13:33 +0000\0"
  "To\0Keerthy <j-keerthy@ti.com>\0"
  "Cc\0linux-omap@vger.kernel.org <linux-omap@vger.kernel.org>"
   Jean Delvare <khali@linux-fr.org>
@@ -56,7 +56,7 @@
  "> +++ b/Documentation/hwmon/omap_temp_sensor\n"
  "> @@ -0,0 +1,27 @@\n"
  "> +Kernel driver omap_temp_sensor\n"
- "> +==============================\n"
+ "> +===============\n"
  "> +\n"
  "> +Supported chips:\n"
  "> +  * Texas Instruments OMAP4460\n"
@@ -828,7 +828,7 @@
  "> +       }\n"
  "> +\n"
  "> +       clk_rate = clk_round_rate(temp_sensor->clock, 2000000);\n"
- "> +       if (clk_rate < 1000000 || clk_rate == 0xffffffff) {\n"
+ "> +       if (clk_rate < 1000000 || clk_rate = 0xffffffff) {\n"
  "> +               dev_err(&pdev->dev, \"Error round rate\\n\");\n"
  "> +               ret = -EINVAL;\n"
  "> +               goto clken_err;\n"
@@ -937,8 +937,7 @@
  "> +               temp_sensor->registers->bgap_counter);\n"
  "> +       temp_sensor->bg_threshold = omap_temp_sensor_readl(temp_sensor,\n"
  "> +               temp_sensor->registers->bgap_threshold);\n"
- "> +       temp_sensor->temp_sensor_tshut_threshold =\n"
- "> +               omap_temp_sensor_readl(temp_sensor,\n"
+ "> +       temp_sensor->temp_sensor_tshut_threshold > +               omap_temp_sensor_readl(temp_sensor,\n"
  "> +               temp_sensor->registers->thsut_threshold);\n"
  "> +}\n"
  "> +\n"
@@ -1042,6 +1041,11 @@
  "> +MODULE_AUTHOR(\"J Keerthy <j-keerthy@ti.com>\");\n"
  "> --\n"
  "> 1.7.0.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
 
-dbe1cab6f9d12aeda16c2f6ca8a043b2e70a80d6b5af67cc9f4049807a9a3e4f
+584ee6fbd5dac133b16b90409a100a477f85c919d58cb6b30ffac27e2af81749
