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-01-27 15:13:28 -08:00
2010-10-21 10:12:40 +11:00
2014-11-19 21:32:12 +11:00
2016-01-22 18:04:28 -05:00