Merge branch 'misc' into test

[safe/jmp/linux-2.6] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 99cf83f..5d1526c 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2173,7 +2173,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
        thermal.crt=    [HW,ACPI]
                        -1: disable all critical trip points in all thermal zones
-                       <degrees C>: lower all critical trip points
+                       <degrees C>: override all critical trip points
 
        thermal.nocrt=  [HW,ACPI]
                        Set to disable actions on ACPI thermal zone