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

Merge 7994a484 ("scsi: ufs: Use pre-calculated offsets in... 


Merge 7994a484 ("scsi: ufs: Use pre-calculated offsets in ufshcd_init_lrb()") into android15-6.6-lts

Steps on the way to 6.6.57

Resolves merge conflicts in:
	net/mac80211/scan.c

Change-Id: Ibe1f3ca919fbc85e6999256fa483e1e0141d675f
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents b131b8ac 7994a484
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