| commit | 9fa0f6db3a201bef49f28e69f80802559a38586b | [log] [tgz] |
|---|---|---|
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | Sun Jul 27 08:55:17 2008 -0300 |
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | Sun Jul 27 12:24:02 2008 -0300 |
| tree | 858548b44a2f218a754b8b0506d1a75c1280732e | |
| parent | 74b9ef21162fd81d9de87319c4373f523e2869cd [diff] |
V4L/DVB (8522): videodev2: Fix merge conflict Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>