Commit fc5ee7e6 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:
#	arch/arm64/configs/defconfig
parents 568f796c 3003c2de
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