]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tty/tty-next'
authorThierry Reding <treding@nvidia.com>
Mon, 21 Oct 2013 11:34:52 +0000 (13:34 +0200)
committerThierry Reding <treding@nvidia.com>
Mon, 21 Oct 2013 11:34:52 +0000 (13:34 +0200)
commitdf00bc024ccdc36491e3c190570f9f9482df6b09
tree9d490eb046cfbc0ab6361687dd92397b4d160dcd
parentf261715ebcf01acfee16853f1c0b33a592339a9b
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