diff options
author | Jiri Kosina <jkosina@suse.cz> | 2011-05-18 15:06:31 (GMT) |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-05-18 15:06:49 (GMT) |
commit | 6b7b8e488bbdedeccabdd001a78ffcbe43bb8a3a (patch) | |
tree | f2f77cc31b4548745778fca6a51b09e1d8a49804 /Documentation/hwmon/smm665 | |
parent | b50f315cbb865079a16a12fd9ae6083f98fd592c (diff) | |
parent | c1d10d18c542278b7fbc413c289d3cb6219da6b3 (diff) | |
download | linux-fsl-qoriq-6b7b8e488bbdedeccabdd001a78ffcbe43bb8a3a.tar.xz |
Merge branch 'master' into upstream.
This is sync with Linus' tree to receive KEY_IMAGES definition
that went in through input tree.
Diffstat (limited to 'Documentation/hwmon/smm665')
-rw-r--r-- | Documentation/hwmon/smm665 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/hwmon/smm665 b/Documentation/hwmon/smm665 index 3820fc9..59e3161 100644 --- a/Documentation/hwmon/smm665 +++ b/Documentation/hwmon/smm665 @@ -150,8 +150,8 @@ in8_crit_alarm Channel F critical alarm in9_crit_alarm AIN1 critical alarm in10_crit_alarm AIN2 critical alarm -temp1_input Chip tempererature -temp1_min Mimimum chip tempererature -temp1_max Maximum chip tempererature -temp1_crit Critical chip tempererature +temp1_input Chip temperature +temp1_min Mimimum chip temperature +temp1_max Maximum chip temperature +temp1_crit Critical chip temperature temp1_crit_alarm Temperature critical alarm |