Commit 66c68689 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 49532079 ("usb: typec: tcpci: Prevent Sink disconnection before... 


Merge 49532079 ("usb: typec: tcpci: Prevent Sink disconnection before vPpsShutdown in SPR PPS") into android14-6.1-lts

Steps on the way to 6.1.129

Resolves merge conflicts in:
	drivers/usb/typec/tcpm/tcpci.c
	drivers/usb/typec/tcpm/tcpm.c

Change-Id: Id20ff6e44155d868c2542d94a30131d8658800c2
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 6e376e10 49532079
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