Skip to content
Snippets Groups Projects
Commit 280def1e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.12-rc3 into tty-next 


Resolves a merge issue with:
	drivers/tty/hvc/hvcs.c
and we want the tty/serial fixes from 5.12-rc3 in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 3d82be8b 1e28eed1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 81 additions and 129 deletions
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