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

Merge 4.5-rc4 into tty-next 



We want the fixes in here, and this resolves a merge error in tty_io.c

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 54573c4a 18558cae
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