V4L/DVB: Fix a merge conflict that affects unlock_ioctl
authorMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 9 Oct 2010 19:43:40 +0000 (16:43 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 21 Oct 2010 03:16:58 +0000 (01:16 -0200)
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

No differences found