diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-03-01 09:02:26 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-01 09:02:26 +0100 |
| commit | 0871d5a66da5c41151e0896a90298b163e42f2e0 (patch) | |
| tree | 1ba71fab9016cb28bb9d18ffd62b6b744f2f761c /Documentation/thermal | |
| parent | x86/boot: Fix pr_debug() API braindamage (diff) | |
| parent | Merge tag 'for-linus-4.11' of git://git.code.sf.net/p/openipmi/linux-ipmi (diff) | |
| download | linux-0871d5a66da5c41151e0896a90298b163e42f2e0.tar.xz linux-0871d5a66da5c41151e0896a90298b163e42f2e0.zip | |
Merge branch 'linus' into WIP.x86/boot, to fix up conflicts and to pick up updates
Conflicts:
arch/x86/xen/setup.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/thermal')
| -rw-r--r-- | Documentation/thermal/nouveau_thermal | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/thermal/nouveau_thermal b/Documentation/thermal/nouveau_thermal index 60bc29357ac3..6e17a11efcb0 100644 --- a/Documentation/thermal/nouveau_thermal +++ b/Documentation/thermal/nouveau_thermal @@ -42,7 +42,7 @@ thresholds can be configured thanks to the following HWMON attributes: * Critical: temp1_crit and temp1_crit_hyst; * Shutdown: temp1_emergency and temp1_emergency_hyst. -NOTE: Remember that the values are stored as milli degrees Celcius. Don't forget +NOTE: Remember that the values are stored as milli degrees Celsius. Don't forget to multiply! Fan management |