Skip to content
Commit 9fa0f6db authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB (8522): videodev2: Fix merge conflict 



Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 74b9ef21
Hide whitespace changes
Inline Side-by-side
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