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

Merge 3.2-rc3 into tty-next to handle merge conflict in tty_ldisc.c 



Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parents 161e773c caca6a03
Expand all 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