Pull thermal into release branch

diff --combined Documentation/kernel-parameters.txt
index 17770b4,18dcfdd..b41cde3
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -952,10 -952,14 +952,10 @@@ and is between 256 and 4096 characters
                        Format: <1-256>
  
        maxcpus=        [SMP] Maximum number of processors that an SMP kernel
 -                      should make use of.
 -                      Using "nosmp" or "maxcpus=0" will disable SMP
 -                      entirely (the MPS table probe still happens, though).
 -                      A command-line option of "maxcpus=<NUM>", where <NUM>
 -                      is an integer greater than 0, limits the maximum number
 -                      of CPUs activated in SMP mode to <NUM>.
 -                      Using "maxcpus=1" on an SMP kernel is the trivial
 -                      case of an SMP kernel with only one CPU.
 +                      should make use of.  maxcpus=n : n >= 0 limits the
 +                      kernel to using 'n' processors.  n=0 is a special case,
 +                      it is equivalent to "nosmp", which also disables
 +                      the IO APIC.
  
        max_addr=[KMG]  [KNL,BOOT,ia64] All physical memory greater than or
                        equal to this physical address is ignored.
@@@ -1180,8 -1184,7 +1180,8 @@@
  
        nosep           [BUGS=X86-32] Disables x86 SYSENTER/SYSEXIT support.
  
 -      nosmp           [SMP] Tells an SMP kernel to act as a UP kernel.
 +      nosmp           [SMP] Tells an SMP kernel to act as a UP kernel,
 +                      and disable the IO APIC.  legacy for "maxcpus=0".
  
        nosoftlockup    [KNL] Disable the soft-lockup detector.
  
@@@ -1823,6 -1826,10 +1823,10 @@@
                        -1: disable all active trip points in all thermal zones
                        <degrees C>: override all lowest active trip points
  
+       thermal.crt=    [HW,ACPI]
+                       -1: disable all critical trip points in all thermal zones
+                       <degrees C>: lower all critical trip points
+ 
        thermal.nocrt=  [HW,ACPI]
                        Set to disable actions on ACPI thermal zone
                        critical and hot trip points.