diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /Documentation/hwmon/sysfs-interface | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
Diffstat (limited to 'Documentation/hwmon/sysfs-interface')
| -rw-r--r-- | Documentation/hwmon/sysfs-interface | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface index 83a698773ade..8f63c244f1aa 100644 --- a/Documentation/hwmon/sysfs-interface +++ b/Documentation/hwmon/sysfs-interface | |||
| @@ -579,7 +579,7 @@ channel should not be trusted. | |||
| 579 | fan[1-*]_fault | 579 | fan[1-*]_fault |
| 580 | temp[1-*]_fault | 580 | temp[1-*]_fault |
| 581 | Input fault condition | 581 | Input fault condition |
| 582 | 0: no fault occured | 582 | 0: no fault occurred |
| 583 | 1: fault condition | 583 | 1: fault condition |
| 584 | RO | 584 | RO |
| 585 | 585 | ||