Commit 05b56650 authored by Linaro CI's avatar Linaro CI
Browse files

Merge remote-tracking branch...

Merge remote-tracking branch 'sa8155p-adp-dts-drivers/tracking-qcomlt-sa8155p-dts-drivers' into integration-linux-qcomlt

# Conflicts:
#	drivers/clk/qcom/gcc-sm8150.c
#	include/dt-bindings/clock/qcom,gcc-sm8150.h
parents 3952d080 4e13698f
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment