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

Merge b27f1076 ("usb: xhci: Add timeout argument in address_device USB HCD... 


Merge b27f1076 ("usb: xhci: Add timeout argument in address_device USB HCD callback") into android13-5.15-lts

Steps on the way to 5.15.179

Resolves merge conflicts in:
	drivers/usb/host/xhci-ring.c
	drivers/usb/host/xhci.h

Change-Id: I99b6ce267fc1e9b51a976a3f0ef647802aebb94b
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 8b377d8d b27f1076
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