diff for duplicates of <20100722162206.GA22313@linux-os.sc.intel.com>

diff --git a/a/1.txt b/N1/1.txt
index 79cc72c..f5874c2 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -143,7 +143,7 @@ index e1a0a3b..d307f9f 100644
  	this_cpu = smp_processor_id();
  	now = get_jiffies_64();
 -	state = &per_cpu(thermal_state, this_cpu);
-+	if (level = CORE_LEVEL)
++	if (level == CORE_LEVEL)
 +		state = &per_cpu(thermal_state, this_cpu).core;
 +	else
 +		state = &per_cpu(thermal_state, this_cpu).package;
@@ -157,7 +157,7 @@ index e1a0a3b..d307f9f 100644
 -		printk(KERN_CRIT "CPU%d: Temperature above threshold, cpu clock throttled (total events = %lu)\n", this_cpu, state->throttle_count);
 +		printk(KERN_CRIT "CPU%d: %s temperature above threshold, cpu clock throttled (total events = %lu)\n",
 +		      this_cpu,
-+		      level = CORE_LEVEL ? "Core" : "Package",
++		      level == CORE_LEVEL ? "Core" : "Package",
 +		      state->throttle_count);
  
  		add_taint(TAINT_MACHINE_CHECK);
@@ -167,7 +167,7 @@ index e1a0a3b..d307f9f 100644
 -		printk(KERN_INFO "CPU%d: Temperature/speed normal\n", this_cpu);
 +		printk(KERN_INFO "CPU%d: %s temperature/speed normal\n",
 +		       this_cpu,
-+		       level = CORE_LEVEL ? "Core" : "Package");
++		       level == CORE_LEVEL ? "Core" : "Package");
  		return 1;
  	}
  
@@ -234,8 +234,3 @@ index e1a0a3b..d307f9f 100644
  	smp_thermal_vector = intel_thermal_interrupt;
  
  	rdmsr(MSR_IA32_MISC_ENABLE, l, h);
-
-_______________________________________________
-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 4d6233d..7f84ad8 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,8 @@
  "ref\094E56C79ECC49A4B87113985F1FEBA8D03F8AE2A4B@bgsmsx502.gar.corp.intel.com\0"
  "ref\04C485DF1.5050407@linux.intel.com\0"
  "From\0Fenghua Yu <fenghua.yu@intel.com>\0"
- "Subject\0[lm-sensors] [PATCH 3/5] Package Level Thermal Control and Power\0"
- "Date\0Thu, 22 Jul 2010 16:22:06 +0000\0"
+ "Subject\0[PATCH 3/5] Package Level Thermal Control and Power Limit Notification: thermal throttling\0"
+ "Date\0Thu, 22 Jul 2010 09:22:06 -0700\0"
  "To\0Ingo Molnar <mingo@redhat.com>"
   Thomas Gleixner <tglx@linutronix.de>
   H. Peter Anvin <hpa@linux.intel.com>
@@ -161,7 +161,7 @@
  " \tthis_cpu = smp_processor_id();\n"
  " \tnow = get_jiffies_64();\n"
  "-\tstate = &per_cpu(thermal_state, this_cpu);\n"
- "+\tif (level = CORE_LEVEL)\n"
+ "+\tif (level == CORE_LEVEL)\n"
  "+\t\tstate = &per_cpu(thermal_state, this_cpu).core;\n"
  "+\telse\n"
  "+\t\tstate = &per_cpu(thermal_state, this_cpu).package;\n"
@@ -175,7 +175,7 @@
  "-\t\tprintk(KERN_CRIT \"CPU%d: Temperature above threshold, cpu clock throttled (total events = %lu)\\n\", this_cpu, state->throttle_count);\n"
  "+\t\tprintk(KERN_CRIT \"CPU%d: %s temperature above threshold, cpu clock throttled (total events = %lu)\\n\",\n"
  "+\t\t      this_cpu,\n"
- "+\t\t      level = CORE_LEVEL ? \"Core\" : \"Package\",\n"
+ "+\t\t      level == CORE_LEVEL ? \"Core\" : \"Package\",\n"
  "+\t\t      state->throttle_count);\n"
  " \n"
  " \t\tadd_taint(TAINT_MACHINE_CHECK);\n"
@@ -185,7 +185,7 @@
  "-\t\tprintk(KERN_INFO \"CPU%d: Temperature/speed normal\\n\", this_cpu);\n"
  "+\t\tprintk(KERN_INFO \"CPU%d: %s temperature/speed normal\\n\",\n"
  "+\t\t       this_cpu,\n"
- "+\t\t       level = CORE_LEVEL ? \"Core\" : \"Package\");\n"
+ "+\t\t       level == CORE_LEVEL ? \"Core\" : \"Package\");\n"
  " \t\treturn 1;\n"
  " \t}\n"
  " \n"
@@ -251,11 +251,6 @@
  "+\n"
  " \tsmp_thermal_vector = intel_thermal_interrupt;\n"
  " \n"
- " \trdmsr(MSR_IA32_MISC_ENABLE, l, h);\n"
- "\n"
- "_______________________________________________\n"
- "lm-sensors mailing list\n"
- "lm-sensors@lm-sensors.org\n"
- http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
+ " \trdmsr(MSR_IA32_MISC_ENABLE, l, h);"
 
-c7dce5c38466fd333079abfb30f4eaa34b4c7f7ffc001a21e07c6dffc505a03f
+e1ff07bf19f35996d6784741eb88357e71e0aaa3eed4843db44a4b90ab1a847c
