Commit dc501ab7 authored by Linaro CI's avatar Linaro CI
Browse files

Merge remote-tracking branch 'sm8250-typec/tracking-qcomlt-sm8250-typec' into...

Merge remote-tracking branch 'sm8250-typec/tracking-qcomlt-sm8250-typec' into integration-linux-qcomlt

# Conflicts:
#	arch/arm64/configs/defconfig
#	drivers/usb/typec/mux/Kconfig
#	drivers/usb/typec/mux/Makefile
parents d1fcf18b 2f67dc15
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment