We want the tty fixes and reverts in here as well so that people can
properly test and use it.
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>