Merge 4.20-rc2 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 12 Nov 2018 02:48:25 +0000 (18:48 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 12 Nov 2018 02:48:25 +0000 (18:48 -0800)
commitc17a1ca14cbba5585df67544711b6d04bcc8e240
tree08935d5f57470bd26b8a6c6dca782cb195644eab
parent596f63da42b92863b40ea4eb29c5b40bfa3e0ef5
parentccda4af0f4b92f7b4c308d3acc262f4a7e3affad
Merge 4.20-rc2 into tty-next

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

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/sh-sci.c