Merge 7.0-rc5 into tty-next

We need the tty/serial fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/tty/serial/8250/8250_pci.c
Simple merge

diff --cc drivers/tty/serial/8250/8250_port.c
Simple merge

diff --cc drivers/tty/vt/vt.c
Simple merge