Commit fd7b7d50 authored by Linaro Codelinaro CI's avatar Linaro Codelinaro CI
Browse files

Merge remote-tracking branch 'tsens-calib/tracking-qcomlt-tsens-calib' into... 

Merge remote-tracking branch 'tsens-calib/tracking-qcomlt-tsens-calib' into integration-linux-qcomlt

# Conflicts:
#	drivers/thermal/qcom/tsens.h
parents 4f7b257c 6f2afbc8
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