Merge branch 'tty-linus' into 'tty-testing'
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 6 Nov 2014 03:43:23 +0000 (19:43 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 6 Nov 2014 03:43:23 +0000 (19:43 -0800)
commit28e1445c650035668514df6f446c81f89990ac52
treec2e15675eb23c5ac3ca6841b1851abb95929f351
parentc015b4ad2ae57e5f07a5d4f746835356056c8e03
parent494c1eac7e73f719af9d474a96ec8494c33efd6a
Merge branch 'tty-linus' into 'tty-testing'

We need the fixes in drivers/tty/tty_io.c that were done in there for
future patches in this branch.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/serial_core.c
drivers/tty/tty_io.c