| commit | 2389b36072892fed57a701e01a7dbe655420e5e5 | [log] [tgz] |
|---|---|---|
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | Wed Aug 06 20:13:46 2008 -0300 |
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | Wed Sep 10 22:54:13 2008 -0300 |
| tree | be25084dd56fcb36ced3f9cd90179ed73bcdc9b2 | |
| parent | 7686ad5606f08d9dfb33a2087a36c8366366015b [diff] |
V4L/DVB (8559a): Fix a merge conflict at gspca/sonixb Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>