Greg Kroah-Hartman 249f3c4fe4 Merge 4.5-rc4 into tty-next
We want the fixes in here, and this resolves a merge error in tty_io.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2016-02-14 14:36:04 -08:00
..
2016-02-14 14:36:04 -08:00
2014-11-12 13:56:41 -05:00
2014-11-12 13:56:41 -05:00
2007-07-10 22:16:43 -07:00
2014-11-12 13:56:41 -05:00