diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 17:00:57 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 17:00:57 +0100 |
| commit | ca364d8388602b5c0d607c5452774833cc1ad667 (patch) | |
| tree | 4c6aa0a71c89b813c73c112391005fc00e44841a /arch/alpha/include/asm/termios.h | |
| parent | tty: Add get- ioctls to fetch tty status v3 (diff) | |
| parent | Linux 3.7-rc3 (diff) | |
| download | linux-ca364d8388602b5c0d607c5452774833cc1ad667.tar.xz linux-ca364d8388602b5c0d607c5452774833cc1ad667.zip | |
Merge 3.7-rc3 into tty-next
This merges the tty changes in 3.7-rc3 into tty-next
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/alpha/include/asm/termios.h')
0 files changed, 0 insertions, 0 deletions