Commit 64c87bfa authored by Linaro CI's avatar Linaro CI
Browse files

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

# Conflicts:
#	Documentation/devicetree/bindings/media/qcom,sdm845-camss.yaml
#	arch/arm64/boot/dts/qcom/sm8450.dtsi
parents aa2c0adc ba315da3
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