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

Merge 17d42662 ("usb: typec: tcpm: set SRC_SEND_CAPABILITIES timeout to... 


Merge 17d42662 ("usb: typec: tcpm: set SRC_SEND_CAPABILITIES timeout to PD_T_SENDER_RESPONSE") into android14-6.1-lts

Steps on the way to 6.1.129

Resolves merge conflicts in:
	drivers/usb/dwc3/core.c

Change-Id: I2c283da276b9179cd76403d2fa83da077615d0be
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 11cb0c5d 17d42662
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