Commit 38c9e765 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 932c2989 ("Merge tag 'tty-5.19-rc1' of...

Merge 932c2989 ("Merge tag 'tty-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty"

) into android-mainline

Steps on the way to 5.19-rc1

Resolves merge conflicts in:
	drivers/tty/hvc/hvc_dcc.c

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I11d3fa88102b8efda85d2c37fee3138b211e4afa
parents 2b869d89 932c2989
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment