]> git.baikalelectronics.ru Git - kernel.git/commit
Merge 4.2-rc4 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Jul 2015 18:12:39 +0000 (11:12 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Jul 2015 18:12:39 +0000 (11:12 -0700)
commit40a4b1cfe08456e4c9566a82b42089904b909882
tree92bfbbc23c3acfb035a88bf257849465b26aa156
parent3abe61bdb7c76eded079f1b91e0323bccab2ac31
parented5bcb8aebc0174d7396d6222e17a9773f9bdb9a
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