Skip to content
GitLab
Commit 2389b360 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8559a): Fix a merge conflict at gspca/sonixb 



Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 7686ad56
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment