]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tty/tty-next'
authorThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:48:03 +0000 (11:48 +0200)
committerThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:48:03 +0000 (11:48 +0200)
commite5abb592b918ce7100512d0ebf4c6e0e18fe7a35
tree293c7ea93406e6cd1c34b018cc0e207ee3796446
parentbc4559520e3662a1e11ecd9dba0bb38d0552eea8
parent943414752045defdd7e476a830e2d8c0ec37cca2
Merge remote-tracking branch 'tty/tty-next'

Conflicts:
drivers/tty/serial/atmel_serial.c
drivers/tty/serial/imx.c
drivers/tty/serial/imx.c
drivers/tty/serial/pmac_zilog.c
drivers/tty/serial/ucc_uart.c
include/linux/tty.h
kernel/sysctl.c