Commit d0a6506e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge cad6da86 ("ALSA: usb-audio: Sort quirk table entries") into android13-5.15-lts 



Steps on the way to 5.15.152

Resolves merge conflicts in:
	sound/usb/quirks.c

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