diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 11:55:17 (GMT) |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 15:24:02 (GMT) |
| commit | 9fa0f6db3a201bef49f28e69f80802559a38586b (patch) | |
| tree | 858548b44a2f218a754b8b0506d1a75c1280732e /drivers/media | |
| parent | 74b9ef21162fd81d9de87319c4373f523e2869cd (diff) | |
| download | linux-fsl-qoriq-9fa0f6db3a201bef49f28e69f80802559a38586b.tar.xz | |
V4L/DVB (8522): videodev2: Fix merge conflict
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
0 files changed, 0 insertions, 0 deletions