Commit a0afe4c2 authored by Linaro Codelinaro CI's avatar Linaro Codelinaro CI
Browse files

Merge remote-tracking branch 'dts-camera/tracking-qcomlt-dts-camera' into integration-linux-qcomlt 

# Conflicts:
#	arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
#	arch/arm64/boot/dts/qcom/sm8450.dtsi
parents f4d01ec6 585c9801
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