Commit 3b6d09b4 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 6f9b5ed8 ("Merge tag 'char-misc-5.19-rc1' of...

Merge 6f9b5ed8 ("Merge tag 'char-misc-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc"

) into android-mainline

Steps on the way to 5.19-rc1

Resolves merge conflicts in:
	drivers/android/binder.c

Cc: Carlos Llamas <cmllamas@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ifcc17a51f95579eb91e23a2c3940cecad5582f15
parents 2825770c 6f9b5ed8
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment