Commit 8ff05dc5 authored by Linaro CI's avatar Linaro CI
Browse files

Merge remote-tracking branch 'sm8450-camcc/tracking-qcomlt-sm8450-camcc' into... 

Merge remote-tracking branch 'sm8450-camcc/tracking-qcomlt-sm8450-camcc' into integration-linux-qcomlt

# Conflicts:
#	drivers/clk/qcom/Kconfig
#	drivers/clk/qcom/Makefile
parents ce148a1d a96747d3
Expand all 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