diff for duplicates of <20100510023510.GA9181@owl>

diff --git a/a/1.txt b/N1/1.txt
index faf7c2a..56717a0 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -18,7 +18,8 @@ That reminds me that dev_warn is right one on multiple CPU system, especially wi
 >  1 file changed, 7 insertions(+), 16 deletions(-)
 > 
 > Index: head/drivers/hwmon/coretemp.c
-> =================================> --- head.orig/drivers/hwmon/coretemp.c
+> ===================================================================
+> --- head.orig/drivers/hwmon/coretemp.c
 > +++ head/drivers/hwmon/coretemp.c
 > @@ -440,6 +440,7 @@ static int __init coretemp_init(void)
 >  {
@@ -43,14 +44,14 @@ That reminds me that dev_warn is right one on multiple CPU system, especially wi
 > -		  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);
 > +			dev_warn("CPU (model=0x%x) has no thermal sensor!\n",
@@ -63,8 +64,3 @@ That reminds me that dev_warn is right one on multiple CPU system, especially wi
 -- 
 Thanks
 Huaxu
-
-_______________________________________________
-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 8fd96bc..f33c63c 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,8 @@
  "ref\020100507095459.GA12190@owl\0"
  "ref\04BE413D1.6090606@osadl.org\0"
  "From\0Huaxu Wan <huaxu.wan@linux.intel.com>\0"
- "Subject\0Re: [lm-sensors] [PATCH 1/2] hwmon: (coretemp) Detect the thermal\0"
- "Date\0Mon, 10 May 2010 02:35:10 +0000\0"
+ "Subject\0Re: [lm-sensors] [PATCH 1/2] hwmon: (coretemp) Detect the thermal sensors by CPUID\0"
+ "Date\0Mon, 10 May 2010 10:35:10 +0800\0"
  "To\0Carsten Emde <Carsten.Emde@osadl.org>\0"
  "Cc\0Huaxu Wan <huaxu.wan@linux.intel.com>"
   LKML <linux-kernel@vger.kernel.org>
@@ -30,7 +30,8 @@
  ">  1 file changed, 7 insertions(+), 16 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"
  "> @@ -440,6 +440,7 @@ static int __init coretemp_init(void)\n"
  ">  {\n"
@@ -55,14 +56,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\tdev_warn(\"CPU (model=0x%x) has no thermal sensor!\\n\",\n"
@@ -74,11 +75,6 @@
  "\n"
  "-- \n"
  "Thanks\n"
- "Huaxu\n"
- "\n"
- "_______________________________________________\n"
- "lm-sensors mailing list\n"
- "lm-sensors@lm-sensors.org\n"
- http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
+ Huaxu
 
-1cfc8ae9e0e7b5f228c77b17e143c657f8da326a286b5b90a9c671561fd49748
+335cd9bd3c6ed5f6d78e9d4eefbdb7d5fbe18e81075ddd3d158837df726d8641
