This resolves a number of tty driver merge issues found in linux-next
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>