diff for duplicates of <20141119092139.1965e44e@amdc2363>

diff --git a/a/1.txt b/N1/1.txt
index 8ad92f3..5deaef4 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -13,21 +13,21 @@ Hi Eduardo,
 > This patch also changes the existing of-thermal users to fit the new
 > API design. No functional change is introduced in this patch.
 > 
-> Cc: Alexandre Courbot <gnurou-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
-> Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-> Cc: Grant Likely <grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
-> Cc: Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>
-> Cc: Jean Delvare <jdelvare-l3A5Bk7waGM@public.gmane.org>
-> Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-> Cc: linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-> Cc: linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-> Cc: lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org
-> Cc: Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
-> Cc: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
-> Cc: Thierry Reding <thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
-> Cc: Zhang Rui <rui.zhang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
-> Reviewed-by: Lukasz Majewski <l.majewski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
-> Signed-off-by: Eduardo Valentin <edubezval-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
+> Cc: Alexandre Courbot <gnurou@gmail.com>
+> Cc: devicetree@vger.kernel.org
+> Cc: Grant Likely <grant.likely@linaro.org>
+> Cc: Guenter Roeck <linux@roeck-us.net>
+> Cc: Jean Delvare <jdelvare@suse.de>
+> Cc: linux-kernel@vger.kernel.org
+> Cc: linux-pm@vger.kernel.org
+> Cc: linux-tegra@vger.kernel.org
+> Cc: lm-sensors@lm-sensors.org
+> Cc: Rob Herring <robh+dt@kernel.org>
+> Cc: Stephen Warren <swarren@wwwdotorg.org>
+> Cc: Thierry Reding <thierry.reding@gmail.com>
+> Cc: Zhang Rui <rui.zhang@intel.com>
+> Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>
+> Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
 > ---
 >  drivers/hwmon/lm75.c                               |  9 +++--
 >  drivers/hwmon/ntc_thermistor.c                     |  6 +++-
@@ -54,8 +54,7 @@ Hi Eduardo,
 >  };
 >  ATTRIBUTE_GROUPS(lm75);
 >  
-> +static const struct thermal_zone_of_device_ops lm75_of_thermal_ops =
-> {
+> +static const struct thermal_zone_of_device_ops lm75_of_thermal_ops > {
 > +	.get_temp = lm75_read_temp,
 > +};
 > +
@@ -90,8 +89,7 @@ Hi Eduardo,
 > +
 >  static int ntc_thermistor_probe(struct platform_device *pdev)
 >  {
->  	const struct of_device_id *of_id =
-> @@ -579,7 +583,7 @@ static int ntc_thermistor_probe(struct
+>  	const struct of_device_id *of_id > @@ -579,7 +583,7 @@ static int ntc_thermistor_probe(struct
 > platform_device *pdev) pdev_id->name);
 >  
 >  	data->tz = thermal_zone_of_sensor_register(data->dev, 0,
@@ -243,7 +241,7 @@ Hi Eduardo,
 >  	struct device_node *np, *child, *sensor_np;
 >  
 > @@ -424,9 +423,7 @@ thermal_zone_of_sensor_register(struct device
-> *dev, int sensor_id, if (sensor_specs.np == sensor_np && id ==
+> *dev, int sensor_id, if (sensor_specs.np = sensor_np && id =
 > sensor_id) { of_node_put(np);
 >  			return thermal_zone_of_add_sensor(child,
 > sensor_np,
@@ -281,8 +279,7 @@ Hi Eduardo,
 >  	{ .compatible = "nvidia,tegra124-soctherm" },
 >  	{ },
 > @@ -416,8 +420,7 @@ static int tegra_soctherm_probe(struct
-> platform_device *pdev) zone->shift =
-> t124_thermctl_temp_zones[i].shift; 
+> platform_device *pdev) zone->shift > t124_thermctl_temp_zones[i].shift; 
 >  		tz = thermal_zone_of_sensor_register(&pdev->dev, i,
 > zone,
 > -
@@ -319,8 +316,7 @@ Hi Eduardo,
 > +					data, &ti_of_thermal_ops);
 >  	if (IS_ERR(data->ti_thermal)) {
 >  		/* Create thermal zone */
->  		data->ti_thermal =
-> thermal_zone_device_register(domain, diff --git
+>  		data->ti_thermal > thermal_zone_device_register(domain, diff --git
 > a/include/linux/thermal.h b/include/linux/thermal.h index
 > ef90838..b565964 100644 --- a/include/linux/thermal.h
 > +++ b/include/linux/thermal.h
@@ -388,3 +384,8 @@ Best regards,
 Lukasz Majewski
 
 Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
+
+_______________________________________________
+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 8b5a53d..f69021c 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,9 +1,9 @@
  "ref\01416321575-18348-1-git-send-email-edubezval@gmail.com\0"
  "ref\01416321575-18348-2-git-send-email-edubezval@gmail.com\0"
  "ref\01416321575-18348-2-git-send-email-edubezval-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org\0"
- "From\0Lukasz Majewski <l.majewski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>\0"
- "Subject\0Re: [PATCHv4 1/1] thermal: of: improve of-thermal sensor registration API\0"
- "Date\0Wed, 19 Nov 2014 09:21:39 +0100\0"
+ "From\0Lukasz Majewski <l.majewski@samsung.com>\0"
+ "Subject\0Re: [lm-sensors] [PATCHv4 1/1] thermal: of: improve of-thermal sensor registration API\0"
+ "Date\0Wed, 19 Nov 2014 08:21:39 +0000\0"
  "To\0Eduardo Valentin <edubezval-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0"
  "Cc\0Linux PM <linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>"
   Caesar Wang <caesar.wang-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
@@ -38,21 +38,21 @@
  "> This patch also changes the existing of-thermal users to fit the new\n"
  "> API design. No functional change is introduced in this patch.\n"
  "> \n"
- "> Cc: Alexandre Courbot <gnurou-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n"
- "> Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n"
- "> Cc: Grant Likely <grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\n"
- "> Cc: Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>\n"
- "> Cc: Jean Delvare <jdelvare-l3A5Bk7waGM@public.gmane.org>\n"
- "> Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n"
- "> Cc: linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n"
- "> Cc: linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n"
- "> Cc: lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org\n"
- "> Cc: Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\n"
- "> Cc: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>\n"
- "> Cc: Thierry Reding <thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n"
- "> Cc: Zhang Rui <rui.zhang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>\n"
- "> Reviewed-by: Lukasz Majewski <l.majewski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>\n"
- "> Signed-off-by: Eduardo Valentin <edubezval-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n"
+ "> Cc: Alexandre Courbot <gnurou@gmail.com>\n"
+ "> Cc: devicetree@vger.kernel.org\n"
+ "> Cc: Grant Likely <grant.likely@linaro.org>\n"
+ "> Cc: Guenter Roeck <linux@roeck-us.net>\n"
+ "> Cc: Jean Delvare <jdelvare@suse.de>\n"
+ "> Cc: linux-kernel@vger.kernel.org\n"
+ "> Cc: linux-pm@vger.kernel.org\n"
+ "> Cc: linux-tegra@vger.kernel.org\n"
+ "> Cc: lm-sensors@lm-sensors.org\n"
+ "> Cc: Rob Herring <robh+dt@kernel.org>\n"
+ "> Cc: Stephen Warren <swarren@wwwdotorg.org>\n"
+ "> Cc: Thierry Reding <thierry.reding@gmail.com>\n"
+ "> Cc: Zhang Rui <rui.zhang@intel.com>\n"
+ "> Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>\n"
+ "> Signed-off-by: Eduardo Valentin <edubezval@gmail.com>\n"
  "> ---\n"
  ">  drivers/hwmon/lm75.c                               |  9 +++--\n"
  ">  drivers/hwmon/ntc_thermistor.c                     |  6 +++-\n"
@@ -79,8 +79,7 @@
  ">  };\n"
  ">  ATTRIBUTE_GROUPS(lm75);\n"
  ">  \n"
- "> +static const struct thermal_zone_of_device_ops lm75_of_thermal_ops =\n"
- "> {\n"
+ "> +static const struct thermal_zone_of_device_ops lm75_of_thermal_ops > {\n"
  "> +\t.get_temp = lm75_read_temp,\n"
  "> +};\n"
  "> +\n"
@@ -115,8 +114,7 @@
  "> +\n"
  ">  static int ntc_thermistor_probe(struct platform_device *pdev)\n"
  ">  {\n"
- ">  \tconst struct of_device_id *of_id =\n"
- "> @@ -579,7 +583,7 @@ static int ntc_thermistor_probe(struct\n"
+ ">  \tconst struct of_device_id *of_id > @@ -579,7 +583,7 @@ static int ntc_thermistor_probe(struct\n"
  "> platform_device *pdev) pdev_id->name);\n"
  ">  \n"
  ">  \tdata->tz = thermal_zone_of_sensor_register(data->dev, 0,\n"
@@ -268,7 +266,7 @@
  ">  \tstruct device_node *np, *child, *sensor_np;\n"
  ">  \n"
  "> @@ -424,9 +423,7 @@ thermal_zone_of_sensor_register(struct device\n"
- "> *dev, int sensor_id, if (sensor_specs.np == sensor_np && id ==\n"
+ "> *dev, int sensor_id, if (sensor_specs.np = sensor_np && id =\n"
  "> sensor_id) { of_node_put(np);\n"
  ">  \t\t\treturn thermal_zone_of_add_sensor(child,\n"
  "> sensor_np,\n"
@@ -306,8 +304,7 @@
  ">  \t{ .compatible = \"nvidia,tegra124-soctherm\" },\n"
  ">  \t{ },\n"
  "> @@ -416,8 +420,7 @@ static int tegra_soctherm_probe(struct\n"
- "> platform_device *pdev) zone->shift =\n"
- "> t124_thermctl_temp_zones[i].shift; \n"
+ "> platform_device *pdev) zone->shift > t124_thermctl_temp_zones[i].shift; \n"
  ">  \t\ttz = thermal_zone_of_sensor_register(&pdev->dev, i,\n"
  "> zone,\n"
  "> -\n"
@@ -344,8 +341,7 @@
  "> +\t\t\t\t\tdata, &ti_of_thermal_ops);\n"
  ">  \tif (IS_ERR(data->ti_thermal)) {\n"
  ">  \t\t/* Create thermal zone */\n"
- ">  \t\tdata->ti_thermal =\n"
- "> thermal_zone_device_register(domain, diff --git\n"
+ ">  \t\tdata->ti_thermal > thermal_zone_device_register(domain, diff --git\n"
  "> a/include/linux/thermal.h b/include/linux/thermal.h index\n"
  "> ef90838..b565964 100644 --- a/include/linux/thermal.h\n"
  "> +++ b/include/linux/thermal.h\n"
@@ -412,6 +408,11 @@
  "\n"
  "Lukasz Majewski\n"
  "\n"
- Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
+ "Samsung R&D Institute Poland (SRPOL) | Linux Platform Group\n"
+ "\n"
+ "_______________________________________________\n"
+ "lm-sensors mailing list\n"
+ "lm-sensors@lm-sensors.org\n"
+ http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
 
-abe00edd102743715fb6ae568e02489ec822408ab448e40047143ee9c2b5ce58
+ceaf4d3c02a07f8807504e330bbf6232c4c11e1b1b6ee3745391d281498301e4
