Commit 2fe4cd43 authored by Carlos Llamas's avatar Carlos Llamas Committed by Treehugger Robot
Browse files

Merge 0d5ec791 ("Merge tag 'char-misc-6.17-rc1' of...

Merge 0d5ec791 ("Merge tag 'char-misc-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc"

) into android-mainline

Steps on the way to v6.17-rc1

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

Cc: Tiffany Yang <ynaffit@google.com>
Change-Id: Ie1e76dbff7a10ca1b8079f48ba2c1b5afee273cc
Signed-off-by: default avatarCarlos Llamas <cmllamas@google.com>
parents 645ddf69 0d5ec791
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment