Commit dc1fd6ae authored by Linaro CI's avatar Linaro CI
Browse files

Merge remote-tracking branch 'apq8064-cpufreq/qcomlt-apq8064-cpufreq' into integration-linux-qcomlt 

# Conflicts:
#	drivers/clk/qcom/Kconfig
#	drivers/clk/qcom/clk-krait.c
parents 9b615e11 c75eea0a
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