Merge 4.1-rc4 into tty-next

This resolves some tty driver merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/tty/n_gsm.c
Simple merge

diff --cc drivers/tty/n_tty.c
Simple merge

diff --cc drivers/tty/serial/amba-pl011.c
Simple merge

diff --cc drivers/tty/tty_buffer.c
Simple merge

diff --cc include/linux/tty.h
Simple merge