Merge 4.5-rc4 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 14 Feb 2016 22:36:04 +0000 (14:36 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 14 Feb 2016 22:36:04 +0000 (14:36 -0800)
commit249f3c4fe4fdef159d3f9b3f7a6c41a92103c860
tree58abfec8444741fd3bd403a908be50c4f63d4842
parent54573c4a073ff510d028f423ed3074573c7d9437
parent18558cae0272f8fd9647e69d3fec1565a7949865
Merge 4.5-rc4 into tty-next

We want the fixes in here, and this resolves a merge error in tty_io.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/pty.c
drivers/tty/serial/8250/8250_pci.c
drivers/tty/serial/omap-serial.c
drivers/tty/tty_mutex.c