]> git.baikalelectronics.ru Git - kernel.git/commit
Merge 4.1-rc4 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 18 May 2015 21:08:58 +0000 (14:08 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 18 May 2015 21:08:58 +0000 (14:08 -0700)
commit41426bdf357e36df2520b8a1db83724831fc8a8f
treedb289a08de50eb4b5caf7840d5b7356ddfa1c51f
parent4935c9e8b46b50ef103c3834d8fad31533910e4f
parent487f8369a912c26a52c8d6d80522bda1571046b7
Merge 4.1-rc4 into tty-next

This resolves some tty driver merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/n_gsm.c
drivers/tty/n_tty.c
drivers/tty/serial/amba-pl011.c
drivers/tty/tty_buffer.c
include/linux/tty.h