diff for duplicates of <20100517094340.019100599@osadl.org>

diff --git a/a/1.txt b/N1/1.txt
index 8bba276..67b5d75 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -13,7 +13,8 @@ Reviewed-By: Valdis Kletnieks <valdis.kletnieks@vt.edu>
  1 file changed, 13 insertions(+), 21 deletions(-)
 
 Index: head/drivers/hwmon/coretemp.c
-=================================--- head.orig/drivers/hwmon/coretemp.c
+===================================================================
+--- head.orig/drivers/hwmon/coretemp.c
 +++ head/drivers/hwmon/coretemp.c
 @@ -451,28 +451,20 @@ static int __init coretemp_init(void)
  
@@ -25,14 +26,14 @@ Index: head/drivers/hwmon/coretemp.c
 -		  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 +58,3 @@ Index: head/drivers/hwmon/coretemp.c
  	}
  	if (list_empty(&pdev_list)) {
  		err = -ENODEV;
-
-
-_______________________________________________
-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 4339446..0a33a53 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,8 +2,8 @@
  "ref\020100514065808.GA11598@owl\0"
  "ref\020100517094136.094800562@osadl.org\0"
  "From\0Carsten Emde <C.Emde@osadl.org>\0"
- "Subject\0[lm-sensors] [PATCH 1/2] Detect the thermal sensors by CPUID\0"
- "Date\0Mon, 17 May 2010 09:41:37 +0000\0"
+ "Subject\0[PATCH 1/2] Detect the thermal sensors by CPUID\0"
+ "Date\0Mon, 17 May 2010 11:41:37 +0200\0"
  "To\0Andrew Morton <akpm@linux-foundation.org>\0"
  "Cc\0Jean Delvare <khali@linux-fr.org>"
   Huaxu Wan <huaxu.wan@intel.com>
@@ -13,6 +13,7 @@
   Henrique de Moraes Holschuh <hmh@hmh.eng.br>
  " Huaxu Wan <huaxu.wan@linux.intel.com>\0"
  "\00:1\0"
+ "fn\0coretemp-simplify-intel-thermal-sensor-recognition.patch\0"
  "b\0"
  "The thermal sensors of Intel(R) CPUs can be detected by CPUID instruction,\n"
  "indicated by CPUID.06H.EAX[0].\n"
@@ -29,7 +30,8 @@
  " 1 file changed, 13 insertions(+), 21 deletions(-)\n"
  "\n"
  "Index: head/drivers/hwmon/coretemp.c\n"
- "=================================--- head.orig/drivers/hwmon/coretemp.c\n"
+ "===================================================================\n"
+ "--- head.orig/drivers/hwmon/coretemp.c\n"
  "+++ head/drivers/hwmon/coretemp.c\n"
  "@@ -451,28 +451,20 @@ static int __init coretemp_init(void)\n"
  " \n"
@@ -41,14 +43,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"
@@ -72,12 +74,6 @@
  "-\t\t\tgoto exit_devices_unreg;\n"
  " \t}\n"
  " \tif (list_empty(&pdev_list)) {\n"
- " \t\terr = -ENODEV;\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "lm-sensors mailing list\n"
- "lm-sensors@lm-sensors.org\n"
- http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
+ " \t\terr = -ENODEV;"
 
-4c727824a7dc5d9a5e00a12f9ba927f0af227ff7aeac9642847399e8377ad900
+4785f814fff51236ce51bf73c7c45b07eee8742c411fcfd61067e6a2befdf3c4
