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

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


Merge 5fed2108 ("usb: xhci: Add timeout argument in address_device USB HCD callback") into android13-5.10-lts

Steps on the way to 5.10.235

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

Change-Id: I88a913759add0aa3666279180f97f5a5ac15157f
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 2afb6720 5fed2108
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