51da4f1481bbbf9eee6c14ca8fb5c78e3028448e
parent 26b9d6c0b0e91c84b4713da5abd16baef3963d33
author Mauro Carvalho Chehab <mchehab@redhat.com> 1257343903 -0200
committer Mauro Carvalho Chehab <mchehab@redhat.com> 1260045671 -0200

V4L/DVB (13271a): Fix a badly solved merge conflict

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
ùÂk–˜