diff for duplicates of <201208240834@sw-eng-lt-dc-vm2>

diff --git a/a/1.txt b/N1/1.txt
index 4c58f7d..9f3bc6d 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -203,7 +203,7 @@ index 0000000..8ece931
 +	/* Wait for interrupt from ADC */
 +	ret = wait_for_completion_timeout(&hwmon->man_adc_rdy,
 +					  msecs_to_jiffies(1000));
-+	if (ret == 0) {
++	if (ret = 0) {
 +		ret = -EBUSY;
 +		goto out;
 +	}
@@ -254,7 +254,7 @@ index 0000000..8ece931
 +		if (val < 0)
 +			return val;
 +
-+		if (channel == DA906X_TJUNC)
++		if (channel = DA906X_TJUNC)
 +			val += hwmon->tjunc_offset;
 +		val = da906x_adc_convert(channel, val);
 +	}
diff --git a/a/content_digest b/N1/content_digest
index eab30ee..d842c44 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,7 +1,7 @@
  "ref\0201208240833@sw-eng-lt-dc-vm2\0"
  "From\0Krystian Garbaciak <krystian.garbaciak@diasemi.com>\0"
- "Subject\0[PATCH 4/8] hwmon: Add DA906x hardware monitoring support.\0"
- "Date\0Fri, 24 Aug 2012 09:32:00 +0100\0"
+ "Subject\0[lm-sensors] [PATCH 4/8] hwmon: Add DA906x hardware monitoring support.\0"
+ "Date\0Fri, 24 Aug 2012 08:32:00 +0000\0"
  "To\0linux-kernel@vger.kernel.org"
   rtc-linux@googlegroups.com
   lm-sensors@lm-sensors.org
@@ -226,7 +226,7 @@
  "+\t/* Wait for interrupt from ADC */\n"
  "+\tret = wait_for_completion_timeout(&hwmon->man_adc_rdy,\n"
  "+\t\t\t\t\t  msecs_to_jiffies(1000));\n"
- "+\tif (ret == 0) {\n"
+ "+\tif (ret = 0) {\n"
  "+\t\tret = -EBUSY;\n"
  "+\t\tgoto out;\n"
  "+\t}\n"
@@ -277,7 +277,7 @@
  "+\t\tif (val < 0)\n"
  "+\t\t\treturn val;\n"
  "+\n"
- "+\t\tif (channel == DA906X_TJUNC)\n"
+ "+\t\tif (channel = DA906X_TJUNC)\n"
  "+\t\t\tval += hwmon->tjunc_offset;\n"
  "+\t\tval = da906x_adc_convert(channel, val);\n"
  "+\t}\n"
@@ -476,4 +476,4 @@
  "lm-sensors@lm-sensors.org\n"
  http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
 
-9466e9762803637b9ab16f30318c614e46eb9068ae81ac6ed7230445f28278df
+7baae171816f4489238d6e49c039c2b8fda2af558f9d7ba193b0235b4098004a
