]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tty/tty-next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:59:14 +0000 (14:59 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:59:14 +0000 (14:59 +0200)
commitbd1db62a010bba690a50738758f017ba563ce459
tree8859335163f54f2df3c3e9216ffc776b49bf1612
parentb4cd00c6ba59009062938d8b432aebb18fd07d8a
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