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)
commit02730d3c053a9af1d402e1c8dc8bbbc5a1340406
treedb289a08de50eb4b5caf7840d5b7356ddfa1c51f
parent77232f791e0605521a978cbe7f79a93df24df374
parente26081808edadfd257c6c9d81014e3b25e9a6118
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