| commit | ebee4b589ffeb8dd700c2a3649e31f4e41c1bb6b | [log] [tgz] |
|---|---|---|
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | Sun Jul 10 16:34:48 2011 -0300 |
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | Wed Jul 27 17:55:40 2011 -0300 |
| tree | f8d64559751c93413d5f6a5e1155b1bb8a3607cf | |
| parent | 064f50966eb65e89c2434b57b2d2326dfee2b50c [diff] |
[media] v4l2-ctrls: Fix a merge conflict Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>