diff for duplicates of <4B0673D7.5010006@ladisch.de>

diff --git a/a/1.txt b/N1/1.txt
index 56991de..b5d67d3 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -16,7 +16,8 @@ v2: Erratum 319 now results in a warning, not an error, because it cannot
 +++ linux-2.6/Documentation/hwmon/k10temp
 @@ -0,0 +1,50 @@
 +Kernel driver k10temp
-+==========+
++=====================
++
 +Supported chips:
 +* AMD Family 10h processors:
 +  Socket F: Quad-Core/Six-Core/Embedded AMD Opteron
@@ -156,7 +157,7 @@ v2: Erratum 319 now results in a warning, not an error, because it cannot
 +	 * Erratum 319: The thermal sensor of older Family 10h processors
 +	 *              (B steppings) may be unreliable.
 +	 */
-+	return boot_cpu_data.x86 = 0x10 && boot_cpu_data.x86_model <= 2;
++	return boot_cpu_data.x86 == 0x10 && boot_cpu_data.x86_model <= 2;
 +}
 +
 +static int __devinit k10temp_probe(struct pci_dev *pdev,
@@ -229,8 +230,3 @@ v2: Erratum 319 now results in a warning, not an error, because it cannot
 +
 +module_init(k10temp_init)
 +module_exit(k10temp_exit)
-
-_______________________________________________
-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 fdb7d5b..6a6d30d 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,8 +2,8 @@
  "ref\04B06501B.8080509@ladisch.de\0"
  "ref\087ws1l5wcl.fsf@depni.sinp.msu.ru\0"
  "From\0Clemens Ladisch <clemens@ladisch.de>\0"
- "Subject\0[lm-sensors] [PATCH v2] k10temp: temperature sensor for AMD Family\0"
- "Date\0Fri, 20 Nov 2009 10:47:51 +0000\0"
+ "Subject\0[PATCH v2] k10temp: temperature sensor for AMD Family 10h/11h CPUs\0"
+ "Date\0Fri, 20 Nov 2009 11:47:51 +0100\0"
  "To\0Serge Belyshev <belyshev@depni.sinp.msu.ru>\0"
  "Cc\0Andrew Morton <akpm@linux-foundation.org>"
   lm-sensors@lm-sensors.org
@@ -28,7 +28,8 @@
  "+++ linux-2.6/Documentation/hwmon/k10temp\n"
  "@@ -0,0 +1,50 @@\n"
  "+Kernel driver k10temp\n"
- "+==========+\n"
+ "+=====================\n"
+ "+\n"
  "+Supported chips:\n"
  "+* AMD Family 10h processors:\n"
  "+  Socket F: Quad-Core/Six-Core/Embedded AMD Opteron\n"
@@ -168,7 +169,7 @@
  "+\t * Erratum 319: The thermal sensor of older Family 10h processors\n"
  "+\t *              (B steppings) may be unreliable.\n"
  "+\t */\n"
- "+\treturn boot_cpu_data.x86 = 0x10 && boot_cpu_data.x86_model <= 2;\n"
+ "+\treturn boot_cpu_data.x86 == 0x10 && boot_cpu_data.x86_model <= 2;\n"
  "+}\n"
  "+\n"
  "+static int __devinit k10temp_probe(struct pci_dev *pdev,\n"
@@ -240,11 +241,6 @@
  "+}\n"
  "+\n"
  "+module_init(k10temp_init)\n"
- "+module_exit(k10temp_exit)\n"
- "\n"
- "_______________________________________________\n"
- "lm-sensors mailing list\n"
- "lm-sensors@lm-sensors.org\n"
- http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
+ +module_exit(k10temp_exit)
 
-6a835af3f909433a8162c9011c22d84f294623584038d32a5df1a951d9673810
+cf59d647c7ec6298c490b2f1e48ae63d1d7123b72363d4eed5e65012114d99c2
