diff for duplicates of <20100514065808.GA11598@owl>

diff --git a/a/1.txt b/N1/1.txt
index 3c4b62b..da9cd1e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -32,14 +32,14 @@ index e9b7fbc..885da2b 100644
 -		  0x17 (Penryn 45nm), 0x1a (Nehalem), 0x1c (Atom),
 -		  0x1e (Lynnfield) */
 -		if ((c->cpuid_level < 0) || (c->x86 != 0x6) ||
--		    !((c->x86_model = 0xe) || (c->x86_model = 0xf) ||
--			(c->x86_model = 0x16) || (c->x86_model = 0x17) ||
--			(c->x86_model = 0x1a) || (c->x86_model = 0x1c) ||
--			(c->x86_model = 0x1e))) {
+-		    !((c->x86_model == 0xe) || (c->x86_model == 0xf) ||
+-			(c->x86_model == 0x16) || (c->x86_model == 0x17) ||
+-			(c->x86_model == 0x1a) || (c->x86_model == 0x1c) ||
+-			(c->x86_model == 0x1e))) {
 -
 -			/* supported CPU not found, but report the unknown
 -			   family 6 CPU */
--			if ((c->x86 = 0x6) && (c->x86_model > 0xf))
+-			if ((c->x86 == 0x6) && (c->x86_model > 0xf))
 -				printk(KERN_WARNING DRVNAME ": Unknown CPU "
 -					"model 0x%x\n", c->x86_model);
 -			continue;
@@ -57,9 +57,3 @@ index e9b7fbc..885da2b 100644
  		err = -ENODEV;
 -- 
 1.6.3.3.363.g725cf7
-
-
-_______________________________________________
-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 dbadd21..0020187 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -3,8 +3,8 @@
  "ref\020100511080112.GB19762@owl\0"
  "ref\020100514032000.GB17786@khazad-dum.debian.net\0"
  "From\0Huaxu Wan <huaxu.wan@linux.intel.com>\0"
- "Subject\0[lm-sensors] [PATCH 1/2 V3 minor change] hwmon: (coretemp) Detect\0"
- "Date\0Fri, 14 May 2010 06:58:08 +0000\0"
+ "Subject\0[PATCH 1/2 V3 minor change] hwmon: (coretemp) Detect the thermal sensors by CPUID\0"
+ "Date\0Fri, 14 May 2010 14:58:08 +0800\0"
  "To\0linux-kernel@vger.kernel.org"
  " lm-sensors@lm-sensors.org\0"
  "Cc\0huaxu.wan@intel.com"
@@ -46,14 +46,14 @@
  "-\t\t  0x17 (Penryn 45nm), 0x1a (Nehalem), 0x1c (Atom),\n"
  "-\t\t  0x1e (Lynnfield) */\n"
  "-\t\tif ((c->cpuid_level < 0) || (c->x86 != 0x6) ||\n"
- "-\t\t    !((c->x86_model = 0xe) || (c->x86_model = 0xf) ||\n"
- "-\t\t\t(c->x86_model = 0x16) || (c->x86_model = 0x17) ||\n"
- "-\t\t\t(c->x86_model = 0x1a) || (c->x86_model = 0x1c) ||\n"
- "-\t\t\t(c->x86_model = 0x1e))) {\n"
+ "-\t\t    !((c->x86_model == 0xe) || (c->x86_model == 0xf) ||\n"
+ "-\t\t\t(c->x86_model == 0x16) || (c->x86_model == 0x17) ||\n"
+ "-\t\t\t(c->x86_model == 0x1a) || (c->x86_model == 0x1c) ||\n"
+ "-\t\t\t(c->x86_model == 0x1e))) {\n"
  "-\n"
  "-\t\t\t/* supported CPU not found, but report the unknown\n"
  "-\t\t\t   family 6 CPU */\n"
- "-\t\t\tif ((c->x86 = 0x6) && (c->x86_model > 0xf))\n"
+ "-\t\t\tif ((c->x86 == 0x6) && (c->x86_model > 0xf))\n"
  "-\t\t\t\tprintk(KERN_WARNING DRVNAME \": Unknown CPU \"\n"
  "-\t\t\t\t\t\"model 0x%x\\n\", c->x86_model);\n"
  "-\t\t\tcontinue;\n"
@@ -70,12 +70,6 @@
  " \tif (list_empty(&pdev_list)) {\n"
  " \t\terr = -ENODEV;\n"
  "-- \n"
- "1.6.3.3.363.g725cf7\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "lm-sensors mailing list\n"
- "lm-sensors@lm-sensors.org\n"
- http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
+ 1.6.3.3.363.g725cf7
 
-d40239db5a04f31456742ecc711c56f5b910cbb30e66462b469b78522ddb1cc6
+905548381a3c366d1a6aed67b762839435831233939ddecb890c27ab69f7d467
