Merge 4.2-rc4 into tty-next
commit92311e46ecf2298d87f175c8449ab4d8c400a38e
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Jul 2015 18:12:39 +0000 (27 11:12 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Jul 2015 18:12:39 +0000 (27 11:12 -0700)
tree92bfbbc23c3acfb035a88bf257849465b26aa156
parentd684779335856d8177514b42a801d46088d897b0
parentcbfe8fa6cd672011c755c3cd85c9ffd4e2d10a6f
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>
drivers/tty/n_tty.c
drivers/tty/serial/Kconfig
drivers/tty/serial/etraxfs-uart.c
drivers/tty/serial/imx.c
drivers/tty/serial/sc16is7xx.c