Merge 4.13-rc5 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Aug 2017 21:46:59 +0000 (14:46 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Aug 2017 21:46:59 +0000 (14:46 -0700)
commitcf0a1579dda4423c43f584a6bf029f033cf1e663
tree089de37c7cc13f9f21ce630737ff3d288e52947f
parent8a5a90a2a477b86a3dc2eaa5a706db9bfdd647ca
parentef954844c7ace62f773f4f23e28d2d915adc419f
Merge 4.13-rc5 into tty-next

We want the fixes in here, and we resolve the merge issue in the
8250_core.c file.

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