Merge 5.7-rc5 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 11 May 2020 06:55:10 +0000 (08:55 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 11 May 2020 06:55:10 +0000 (08:55 +0200)
We need the tty fixes in here too.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
drivers/tty/serial/Kconfig
drivers/tty/serial/xilinx_uartps.c

Simple merge
Simple merge