tree 3d1a33e60443774cf5199c6bc6ee4b76f4d57ac3
parent be737a826949760b75c3b46fc86686274965fca1
author Mauro Carvalho Chehab <mchehab@redhat.com> 1286653420 -0300
committer Mauro Carvalho Chehab <mchehab@redhat.com> 1287631018 -0200

V4L/DVB: Fix a merge conflict that affects unlock_ioctl

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>