Skip to content
Commit becba85f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.0-rc3 into tty-testing 



This resolves a merge issue in drivers/tty/serial/8250/8250_pci.c

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 9eccca08 3372ec28
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment