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

Merge a0113b46 ("Merge patch series "scsi: bfa: Remove deadcode"") into android-mainline 



Steps on the way to 6.13-rc1

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

Change-Id: Ie9647cc4f0bd59ac126ebc79a9d3a9d251d3d27e
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents e3307b7f a0113b46
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