diff options
author | Len Brown <len.brown@intel.com> | 2009-12-15 22:35:50 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-12-15 22:35:50 -0500 |
commit | 1667e399a41be976c9d37bf02aa477979df111d2 (patch) | |
tree | 9b412df956905afecc15753628b608c06f9b11d7 /Documentation | |
parent | abdef01daceb120ef8cc03fbc96d5e029e2810b0 (diff) | |
parent | 3767cb54ac718eb049d2a29f7a575ab923550ba5 (diff) | |
download | op-kernel-dev-1667e399a41be976c9d37bf02aa477979df111d2.zip op-kernel-dev-1667e399a41be976c9d37bf02aa477979df111d2.tar.gz |
Merge branch 'thermal-2.6.33' into release
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/thermal/sysfs-api.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/thermal/sysfs-api.txt b/Documentation/thermal/sysfs-api.txt index a87dc27..cb3d15b 100644 --- a/Documentation/thermal/sysfs-api.txt +++ b/Documentation/thermal/sysfs-api.txt @@ -206,6 +206,7 @@ passive passive trip point for the zone. Activation is done by polling with an interval of 1 second. Unit: millidegrees Celsius + Valid values: 0 (disabled) or greater than 1000 RW, Optional ***************************** |