diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-05-28 12:01:07 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-05-28 12:01:07 +0200 |
| commit | 6e9041c6ddd6cbdc61d87bcaca8ca7bb17c28377 (patch) | |
| tree | c250644c5adce04947d664318996de16df3f02da /Documentation/hwmon/zl6100 | |
| parent | b96516220870d8571fc12da980668687c122976e (diff) | |
| parent | e4aa937ec75df0eea0bee03bffa3303ad36c986b (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'Documentation/hwmon/zl6100')
| -rw-r--r-- | Documentation/hwmon/zl6100 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/hwmon/zl6100 b/Documentation/hwmon/zl6100 index 756b57c6b73e..33908a4d68ff 100644 --- a/Documentation/hwmon/zl6100 +++ b/Documentation/hwmon/zl6100 @@ -125,7 +125,7 @@ in2_label "vmon" in2_input Measured voltage on VMON (ZL2004) or VDRV (ZL9101M, ZL9117M) pin. Reported voltage is 16x the voltage on the pin (adjusted internally by the chip). -in2_lcrit Critical minumum VMON/VDRV Voltage. +in2_lcrit Critical minimum VMON/VDRV Voltage. in2_crit Critical maximum VMON/VDRV voltage. in2_lcrit_alarm VMON/VDRV voltage critical low alarm. in2_crit_alarm VMON/VDRV voltage critical high alarm. |