Merge branch 'tty-linus' into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Feb 2014 18:06:34 +0000 (10:06 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Feb 2014 18:06:34 +0000 (10:06 -0800)
We want the tty core fixes in here as well, because other patches depend
on them.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Trivial merge