diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-26 22:06:06 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-26 22:06:06 +0200 |
commit | efe45ab1ee04551936f8343bd4ca1ff02ffc23bb (patch) | |
tree | f2bc88ccd5a01770b6a8efe3f6023068179f610b /arch/mn10300/kernel/entry.S | |
parent | Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
parent | omap-serial: Allow IXON and IXOFF to be disabled. (diff) | |
download | linux-efe45ab1ee04551936f8343bd4ca1ff02ffc23bb.tar.xz linux-efe45ab1ee04551936f8343bd4ca1ff02ffc23bb.zip |
Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
omap-serial: Allow IXON and IXOFF to be disabled.
TTY: serial, document ignoring of uart->ops->startup error
TTY: pty, fix pty counting
8250: Fix race condition in serial8250_backup_timeout().
serial/8250_pci: delete duplicate data definition
8250_pci: add support for Rosewill RC-305 4x serial port card
tty: Add "spi:" prefix for spi modalias
atmel_serial: fix atmel_default_console_device
serial: 8250_pnp: add Intermec CV60 touchscreen device
drivers/serial/ucc_uart.c: Fix compiler warning
pch_uart: Set PCIe bus number using probe parameter
serial: samsung: Fix build error
Diffstat (limited to 'arch/mn10300/kernel/entry.S')
0 files changed, 0 insertions, 0 deletions