| commit | 2389b36072892fed57a701e01a7dbe655420e5e5 | |
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | |
| Wed, 6 Aug 2008 23:13:46 +0000 (6 20:13 -0300) | ||
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | |
| Thu, 11 Sep 2008 01:54:13 +0000 (10 22:54 -0300) | ||
| tree | be25084dd56fcb36ced3f9cd90179ed73bcdc9b2 | treesnapshot (tar.gz zip) |
| parent | 7686ad5606f08d9dfb33a2087a36c8366366015b | commitdiff |
V4L/DVB (8559a): Fix a merge conflict at gspca/sonixb
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| drivers/media/video/gspca/sonixb.c | diffblobblamehistory |