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

Browse Source

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

...

This commit is contained in:

Mauro Carvalho Chehab 2008-07-27 08:55:17 -03:00

parent 74b9ef2116

commit 9fa0f6db3a

1 changed files with 2 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files