diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:28:38 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:28:38 -0400 |
| commit | 5f50ef453dcb05115fc98f244b8f10bfacd4b8b7 (patch) | |
| tree | 1999a7e6d242198d48f0089c7995a50f339fa3e4 /Documentation | |
| parent | 530bc23bfeaa9156003afbeb9708fd03a5f1c73c (diff) | |
| parent | e3deda9c87ac5eef2b5d18cd0b5511370979ca26 (diff) | |
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 | |||
| 2173 | 2173 | ||
| 2174 | thermal.crt= [HW,ACPI] | 2174 | thermal.crt= [HW,ACPI] |
| 2175 | -1: disable all critical trip points in all thermal zones | 2175 | -1: disable all critical trip points in all thermal zones |
| 2176 | <degrees C>: lower all critical trip points | 2176 | <degrees C>: override all critical trip points |
| 2177 | 2177 | ||
| 2178 | thermal.nocrt= [HW,ACPI] | 2178 | thermal.nocrt= [HW,ACPI] |
| 2179 | Set to disable actions on ACPI thermal zone | 2179 | Set to disable actions on ACPI thermal zone |