We want the fixes in here, and this resolves a merge error in tty_io.c
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>