Commit 8318385e authored by Linaro Gitlab CI's avatar Linaro Gitlab CI
Browse files

Merge remote-tracking branch 'qca6390/tracking-qcomlt-qca6390' into integration-linux-qcomlt 

# Conflicts:
#	arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
#	drivers/bluetooth/hci_qca.c
parents 0ec95ed9 ecba154b
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