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)
commit5669b705024659e982472cef22f7fc3c3a09cba2
treed04f516fdf65a781434d13cc4e61b78d7416e40e
parent05202872ca98f8ea61943a9b530417c5503b816f
parent45a7bd635930baa960b6817674c64bdfb8f39570
Merge branch 'tty-linus' into tty-next

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>