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

Merge remote-tracking branch 'camss-libcamera/tracking-qcomlt-camss-libcamera'...

Merge remote-tracking branch 'camss-libcamera/tracking-qcomlt-camss-libcamera' into integration-linux-qcomlt

# Conflicts:
#	drivers/media/platform/qcom/camss/camss-video.c
parents d2f513c6 440726a2
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment