diff for duplicates of <20140511103152.GA5631@dashie>

diff --git a/a/1.txt b/N1/1.txt
index 66ba03e..56a19bc 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -107,7 +107,7 @@ index 90ec117..05e9f1f 100644
  
 -	retval = i2c_smbus_write_byte_data(client, 0x21, hyst);
 +	retval = i2c_smbus_write_byte_data(client, EMC1403_HYST_REG, hyst);
- 	if (retval = 0) {
+ 	if (retval == 0) {
  		retval = count;
  		data->cached_hyst = hyst;
 @@ -252,6 +253,28 @@ static SENSOR_DEVICE_ATTR(temp4_crit_hyst, S_IRUGO | S_IWUSR,
@@ -257,7 +257,7 @@ index 90ec117..05e9f1f 100644
 -	data = devm_kzalloc(&client->dev, sizeof(struct thermal_data),
 +	data = devm_kzalloc(&client->dev, sizeof(struct emc1403_data),
  			    GFP_KERNEL);
- 	if (data = NULL)
+ 	if (data == NULL)
  		return -ENOMEM;
 @@ -351,9 +411,17 @@ static int emc1403_probe(struct i2c_client *client,
  	mutex_init(&data->mutex);
@@ -328,8 +328,3 @@ index 90ec117..05e9f1f 100644
  MODULE_DESCRIPTION("emc1403 Thermal Driver");
  MODULE_LICENSE("GPL v2");
 +MODULE_ALIAS("i2c:emc1403");
-
-_______________________________________________
-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 7031083..c61fc5d 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,6 +1,6 @@
  "From\0Josef Gajdusek <atx@atx.name>\0"
- "Subject\0[lm-sensors] [PATCH] drivers/hwmon: bugfix and support for emc1412 in emc1403.c\0"
- "Date\0Sun, 11 May 2014 10:31:52 +0000\0"
+ "Subject\0[PATCH] drivers/hwmon: bugfix and support for emc1412 in emc1403.c\0"
+ "Date\0Sun, 11 May 2014 12:31:52 +0200\0"
  "To\0jdelvare@suse.de\0"
  "Cc\0linux@roeck-us.net"
   lm-sensors@lm-sensors.org
@@ -116,7 +116,7 @@
  " \n"
  "-\tretval = i2c_smbus_write_byte_data(client, 0x21, hyst);\n"
  "+\tretval = i2c_smbus_write_byte_data(client, EMC1403_HYST_REG, hyst);\n"
- " \tif (retval = 0) {\n"
+ " \tif (retval == 0) {\n"
  " \t\tretval = count;\n"
  " \t\tdata->cached_hyst = hyst;\n"
  "@@ -252,6 +253,28 @@ static SENSOR_DEVICE_ATTR(temp4_crit_hyst, S_IRUGO | S_IWUSR,\n"
@@ -266,7 +266,7 @@
  "-\tdata = devm_kzalloc(&client->dev, sizeof(struct thermal_data),\n"
  "+\tdata = devm_kzalloc(&client->dev, sizeof(struct emc1403_data),\n"
  " \t\t\t    GFP_KERNEL);\n"
- " \tif (data = NULL)\n"
+ " \tif (data == NULL)\n"
  " \t\treturn -ENOMEM;\n"
  "@@ -351,9 +411,17 @@ static int emc1403_probe(struct i2c_client *client,\n"
  " \tmutex_init(&data->mutex);\n"
@@ -336,11 +336,6 @@
  " MODULE_AUTHOR(\"Kalhan Trisal <kalhan.trisal@intel.com\");\n"
  " MODULE_DESCRIPTION(\"emc1403 Thermal Driver\");\n"
  " MODULE_LICENSE(\"GPL v2\");\n"
- "+MODULE_ALIAS(\"i2c:emc1403\");\n"
- "\n"
- "_______________________________________________\n"
- "lm-sensors mailing list\n"
- "lm-sensors@lm-sensors.org\n"
- http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
+ "+MODULE_ALIAS(\"i2c:emc1403\");"
 
-a455711a3fa3644be88c7fd4ea125ef86a658744e3e28ad8c85e5553ecda2d09
+0860fb0cbe589bce3f769982722831744a1510343f35334c1aaa5b363ae13708
