Commit 1a79d14d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Treehugger Robot
Browse files

Merge a298df1b ("usb: dwc3: Fix timeout issue during controller enter/exit... 


Merge a298df1b ("usb: dwc3: Fix timeout issue during controller enter/exit from halt state") into android14-6.1-lts

Steps on the way to 6.1.129

Resolves merge conflicts in:
	drivers/pps/clients/pps-ldisc.c

Change-Id: Idc1822210eb87723c7e7e34ad8ba71d2ca1d4ad3
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 43908d99 a298df1b
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