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

Merge 4.15-rc6 into tty-next 



We want the ldisc fix here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 2b022ab7 30a7acd5
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