Merge 4.2-rc4 into tty-next

Other serial driver work wants to build on patches now in 4.2-rc4 so
merge the branch so this can properly happen.

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

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

diff --cc drivers/tty/serial/Kconfig
Simple merge

diff --cc drivers/tty/serial/etraxfs-uart.c
Simple merge

diff --cc drivers/tty/serial/imx.c
Simple merge

diff --cc drivers/tty/serial/sc16is7xx.c
Simple merge