Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: tty_port,usb-console: Fix usb serial console open/close regression tty: cpm_uart: use resource_size() tty_buffer: Fix distinct type warning hvc_console: Fix race between hvc_close and hvc_remove uartlite: Fix build on sparc. tty: Take a 256 byte padding into account when buffering below sub-page units Revert "tty: Add a new VT mode which is like VT_PROCESS but doesn't require a VT_RELDISP ioctl call"
No related branches found
No related tags found
Showing
- drivers/char/hvc_console.c 21 additions, 10 deletionsdrivers/char/hvc_console.c
- drivers/char/tty_buffer.c 2 additions, 2 deletionsdrivers/char/tty_buffer.c
- drivers/char/tty_port.c 1 addition, 1 deletiondrivers/char/tty_port.c
- drivers/char/vt_ioctl.c 19 additions, 20 deletionsdrivers/char/vt_ioctl.c
- drivers/serial/cpm_uart/cpm_uart_cpm2.c 2 additions, 2 deletionsdrivers/serial/cpm_uart/cpm_uart_cpm2.c
- drivers/usb/serial/console.c 1 addition, 0 deletionsdrivers/usb/serial/console.c
- include/linux/tty.h 6 additions, 4 deletionsinclude/linux/tty.h
- include/linux/vt.h 1 addition, 2 deletionsinclude/linux/vt.h
Loading
Please register or sign in to comment