Commit 6189e51a authored by Linaro Gitlab CI's avatar Linaro Gitlab 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
#	drivers/thermal/qcom/tsens-v2.c
#	drivers/thermal/qcom/tsens.h
parents 1ba86992 3aeb99bc
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment