diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-09 08:44:23 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-09 08:44:23 +0100 |
| commit | e94f16a4fde646b3f155788fe37339b61264b0a9 (patch) | |
| tree | 28f1cf8b1980b6b25c1c58e3e157610a1b851996 /tools/thermal/tmon/tmon.8 | |
| parent | d2b5851d8583e690eeb5ac8dfff5da92e1f1468f (diff) | |
| parent | 9eccca0843205f87c00404b663188b88eb248051 (diff) | |
| download | talos-obmc-linux-e94f16a4fde646b3f155788fe37339b61264b0a9.tar.gz talos-obmc-linux-e94f16a4fde646b3f155788fe37339b61264b0a9.zip | |
Merge 4.0-rc3 into char-misc-next
We want the mei fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/thermal/tmon/tmon.8')
| -rw-r--r-- | tools/thermal/tmon/tmon.8 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/thermal/tmon/tmon.8 b/tools/thermal/tmon/tmon.8 index 0be727cb9892..02d5179803aa 100644 --- a/tools/thermal/tmon/tmon.8 +++ b/tools/thermal/tmon/tmon.8 @@ -55,6 +55,8 @@ The \fB-l --log\fP option write data to /var/tmp/tmon.log .PP The \fB-t --time-interval\fP option sets the polling interval in seconds .PP +The \fB-T --target-temp\fP option sets the initial target temperature +.PP The \fB-v --version\fP option shows the version of \fBtmon \fP .PP The \fB-z --zone\fP option sets the target therma zone instance to be controlled |
