Commit 41cffbaf authored by Carlos Llamas's avatar Carlos Llamas Committed by Treehugger Robot
Browse files

Merge v6.15-rc3 into android-mainline 



Steps on the way to v6.15-rc3

Resolved merge conflicts in:
    drivers/ufs/core/ufshcd.c

Cc: Jaegeuk Kim <jaegeuk@google.com>
Cc: Eric Biggers <ebiggers@google.com>
Change-Id: I9c51f9667be9de76b243f6c3bf258a1e4a76f53a
Signed-off-by: default avatarCarlos Llamas <cmllamas@google.com>
parents 4179d820 9c32cda4
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment