diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-13 10:06:34 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-13 10:06:34 -0800 |
| commit | 5669b705024659e982472cef22f7fc3c3a09cba2 (patch) | |
| tree | d04f516fdf65a781434d13cc4e61b78d7416e40e /Documentation | |
| parent | 05202872ca98f8ea61943a9b530417c5503b816f (diff) | |
| parent | 45a7bd635930baa960b6817674c64bdfb8f39570 (diff) | |
| download | op-kernel-dev-5669b705024659e982472cef22f7fc3c3a09cba2.zip op-kernel-dev-5669b705024659e982472cef22f7fc3c3a09cba2.tar.gz | |
Merge branch 'tty-linus' into tty-next
We want the tty core fixes in here as well, because other patches depend
on them.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/ABI/testing/sysfs-tty | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/ABI/testing/sysfs-tty b/Documentation/ABI/testing/sysfs-tty index ad22fb0..a2ccec3 100644 --- a/Documentation/ABI/testing/sysfs-tty +++ b/Documentation/ABI/testing/sysfs-tty @@ -3,7 +3,8 @@ Date: Nov 2010 Contact: Kay Sievers <kay.sievers@vrfy.org> Description: Shows the list of currently configured - console devices, like 'tty1 ttyS0'. + tty devices used for the console, + like 'tty1 ttyS0'. The last entry in the file is the active device connected to /dev/console. The file supports poll() to detect virtual |
