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

Merge remote-tracking branch... 

Merge remote-tracking branch 'ov8856-remove-mode/tracking-qcomlt-ov8856-remove-mode' into integration-linux-qcomlt

# Conflicts:
#	drivers/media/i2c/ov8856.c
parents cfa84188 e30224f9
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