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

Merge 07acd398 ("usb: cdnsp: Fix issue with CV Bad Descriptor test") into android14-6.1-lts 



Steps on the way to 6.1.146

Resolves merge conflicts in:
	drivers/usb/gadget/function/u_serial.c
	drivers/usb/host/xhci.h

Change-Id: I0afcd91fef99dc6ff0f5c93500c8c66df8fb56be
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 67e62b61 07acd398
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