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

Merge 4.1-rc4 into tty-next 



This resolves some tty driver merge issues.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 77232f79 e2608180
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