diff for duplicates of <20130918155732.GA17160@roeck-us.net>

diff --git a/a/1.txt b/N1/1.txt
index 2084358..2da8895 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -13,10 +13,10 @@ On Wed, Sep 18, 2013 at 11:54:18AM -0400, Eduardo Valentin wrote:
 > >>>>>> a thermal zone for this sensor is present inside the tmp102 DT
 > >>>>>> node. Otherwise, the driver behavior will be the same.
 > >>>>>>
-> >>>>>> Cc: Jean Delvare <khali@linux-fr.org> Cc: Guenter Roeck
-> >>>>>> <linux@roeck-us.net> Cc: lm-sensors@lm-sensors.org Cc:
-> >>>>>> linux-kernel@vger.kernel.org Signed-off-by: Eduardo Valentin
-> >>>>>> <eduardo.valentin@ti.com> --- drivers/hwmon/tmp102.c | 28
+> >>>>>> Cc: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org> Cc: Guenter Roeck
+> >>>>>> <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org> Cc: lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org Cc:
+> >>>>>> linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Signed-off-by: Eduardo Valentin
+> >>>>>> <eduardo.valentin-l0cyMroinI0@public.gmane.org> --- drivers/hwmon/tmp102.c | 28
 > >>>>>> ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
 > >>>>>>
 > >>>>>> diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c 
@@ -37,7 +37,8 @@ On Wed, Sep 18, 2013 at 11:54:18AM -0400, Eduardo Valentin wrote:
 > >>>>>> tmp102; }
 > >>>>>>
 > >>>>>> +static int tmp102_read_temp(void *dev, long *temp) +{ +
-> >>>>>> struct tmp102 *tmp102 > >>>>>> tmp102_update_device(to_i2c_client(dev)); + +    if
+> >>>>>> struct tmp102 *tmp102 =
+> >>>>>> tmp102_update_device(to_i2c_client(dev)); + +    if
 > >>>>>> (tmp102->temp[0] < 0) +        dev_warn(tmp102->hwmon_dev, +
 > >>>>>> "operating in negative temp: %d\n", tmp102->temp[0]); +
 > >>>>>
@@ -125,7 +126,8 @@ On Wed, Sep 18, 2013 at 11:54:18AM -0400, Eduardo Valentin wrote:
 > >> -       if (IS_ERR(tmp102->tz))
 > >> -               tmp102->tz = NULL;
 > >> +       if ((of_find_property(client->dev.of_node, "#sensor-cells", NULL)) {
-> >> +               tmp102->tz > >> thermal_zone_of_sensor_register(&client->dev, 0,
+> >> +               tmp102->tz =
+> >> thermal_zone_of_sensor_register(&client->dev, 0,
 > >> +                                                            &client->dev,
 > >> +
 > >> tmp102_read_temp, NULL);
@@ -163,8 +165,7 @@ On Wed, Sep 18, 2013 at 11:54:18AM -0400, Eduardo Valentin wrote:
 I'll leave that up to the devicetree folks to decide.
 
 Guenter
-
-_______________________________________________
-lm-sensors mailing list
-lm-sensors@lm-sensors.org
-http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
+--
+To unsubscribe from this list: send the line "unsubscribe devicetree" in
+the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff --git a/a/content_digest b/N1/content_digest
index 04f1efd..3b11a01 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -7,9 +7,9 @@
  "ref\020130918151746.GA17065@roeck-us.net\0"
  "ref\05239CCAA.7030505@ti.com\0"
  "ref\05239CCAA.7030505-l0cyMroinI0@public.gmane.org\0"
- "From\0Guenter Roeck <linux@roeck-us.net>\0"
- "Subject\0Re: [lm-sensors] [PATCH 06/16] hwmon: tmp102: expose to thermal fw via DT nodes\0"
- "Date\0Wed, 18 Sep 2013 15:57:32 +0000\0"
+ "From\0Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>\0"
+ "Subject\0Re: [PATCH 06/16] hwmon: tmp102: expose to thermal fw via DT nodes\0"
+ "Date\0Wed, 18 Sep 2013 08:57:32 -0700\0"
  "To\0Eduardo Valentin <eduardo.valentin-l0cyMroinI0@public.gmane.org>\0"
  "Cc\0devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>"
  " lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org <lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org>\0"
@@ -30,10 +30,10 @@
  "> >>>>>> a thermal zone for this sensor is present inside the tmp102 DT\n"
  "> >>>>>> node. Otherwise, the driver behavior will be the same.\n"
  "> >>>>>>\n"
- "> >>>>>> Cc: Jean Delvare <khali@linux-fr.org> Cc: Guenter Roeck\n"
- "> >>>>>> <linux@roeck-us.net> Cc: lm-sensors@lm-sensors.org Cc:\n"
- "> >>>>>> linux-kernel@vger.kernel.org Signed-off-by: Eduardo Valentin\n"
- "> >>>>>> <eduardo.valentin@ti.com> --- drivers/hwmon/tmp102.c | 28\n"
+ "> >>>>>> Cc: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org> Cc: Guenter Roeck\n"
+ "> >>>>>> <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org> Cc: lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org Cc:\n"
+ "> >>>>>> linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Signed-off-by: Eduardo Valentin\n"
+ "> >>>>>> <eduardo.valentin-l0cyMroinI0@public.gmane.org> --- drivers/hwmon/tmp102.c | 28\n"
  "> >>>>>> ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)\n"
  "> >>>>>>\n"
  "> >>>>>> diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c \n"
@@ -54,7 +54,8 @@
  "> >>>>>> tmp102; }\n"
  "> >>>>>>\n"
  "> >>>>>> +static int tmp102_read_temp(void *dev, long *temp) +{ +\n"
- "> >>>>>> struct tmp102 *tmp102 > >>>>>> tmp102_update_device(to_i2c_client(dev)); + +    if\n"
+ "> >>>>>> struct tmp102 *tmp102 =\n"
+ "> >>>>>> tmp102_update_device(to_i2c_client(dev)); + +    if\n"
  "> >>>>>> (tmp102->temp[0] < 0) +        dev_warn(tmp102->hwmon_dev, +\n"
  "> >>>>>> \"operating in negative temp: %d\\n\", tmp102->temp[0]); +\n"
  "> >>>>>\n"
@@ -142,7 +143,8 @@
  "> >> -       if (IS_ERR(tmp102->tz))\n"
  "> >> -               tmp102->tz = NULL;\n"
  "> >> +       if ((of_find_property(client->dev.of_node, \"#sensor-cells\", NULL)) {\n"
- "> >> +               tmp102->tz > >> thermal_zone_of_sensor_register(&client->dev, 0,\n"
+ "> >> +               tmp102->tz =\n"
+ "> >> thermal_zone_of_sensor_register(&client->dev, 0,\n"
  "> >> +                                                            &client->dev,\n"
  "> >> +\n"
  "> >> tmp102_read_temp, NULL);\n"
@@ -180,10 +182,9 @@
  "I'll leave that up to the devicetree folks to decide.\n"
  "\n"
  "Guenter\n"
- "\n"
- "_______________________________________________\n"
- "lm-sensors mailing list\n"
- "lm-sensors@lm-sensors.org\n"
- http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
+ "--\n"
+ "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n"
+ "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n"
+ More majordomo info at  http://vger.kernel.org/majordomo-info.html
 
-499fee0976089693f93b498e7c6ba4268552422e3653be39cd09a9e8d686d899
+75f4ce15bd7604de3e0a02f7df960da402c3a463c8ff4119a175ded42239b7be
