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

Merge f354086d ("ALSA: usb-audio: add quirk for RODE NT-USB+") into android13-5.15-lts 



Steps on the way to 5.15.152

Resolves merge conflicts in:
	sound/usb/endpoint.c
	sound/usb/endpoint.h
	sound/usb/pcm.c

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