[media] v4l2-ctrls: Fix a merge conflict
authorMauro Carvalho Chehab <mchehab@redhat.com>
Sun, 10 Jul 2011 19:34:48 +0000 (16:34 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 27 Jul 2011 20:55:40 +0000 (17:55 -0300)
commitebee4b589ffeb8dd700c2a3649e31f4e41c1bb6b
treef8d64559751c93413d5f6a5e1155b1bb8a3607cf
parent064f50966eb65e89c2434b57b2d2326dfee2b50c
[media] v4l2-ctrls: Fix a merge conflict

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/v4l2-ctrls.c