V4L/DVB (13271a): Fix a badly solved merge conflict
authorMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 4 Nov 2009 14:11:43 +0000 (12:11 -0200)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 5 Dec 2009 20:41:11 +0000 (18:41 -0200)
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

No differences found