Commit a9b5a6d2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Treehugger Robot
Browse files

Merge 0637a68b ("Merge tag 'scsi-misc' of... 

Merge 0637a68b ("Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi"

) into android-mainline

Steps on the way to 6.13-rc1

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

Change-Id: I7d34625abad340f06a090e302bd7a1cae623082f
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 4d8ce1cb 0637a68b
Expand all 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