tree c2e15675eb23c5ac3ca6841b1851abb95929f351
parent c015b4ad2ae57e5f07a5d4f746835356056c8e03
parent 494c1eac7e73f719af9d474a96ec8494c33efd6a
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1415245403 -0800
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1415245403 -0800

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>