diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-23 05:28:38 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-23 05:28:38 +0200 |
| commit | 5f50ef453dcb05115fc98f244b8f10bfacd4b8b7 (patch) | |
| tree | 1999a7e6d242198d48f0089c7995a50f339fa3e4 /Documentation | |
| parent | Merge branch 'i7300_idle' into test (diff) | |
| parent | asus-laptop: Fix the led behavior with value > 1 (diff) | |
| download | linux-5f50ef453dcb05115fc98f244b8f10bfacd4b8b7.tar.xz linux-5f50ef453dcb05115fc98f244b8f10bfacd4b8b7.zip | |
Merge branch 'misc' into test
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 99cf83fd6947..5d1526cb9cc7 100644 --- 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 |