]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7686ad5) | patch
V4L/DVB (8559a): Fix a merge conflict at gspca/sonixb
authorMauro Carvalho Chehab <mchehab@infradead.org>
Wed, 6 Aug 2008 23:13:46 +0000 (20:13 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 11 Sep 2008 01:54:13 +0000 (22:54 -0300)
commit2389b36072892fed57a701e01a7dbe655420e5e5
treebe25084dd56fcb36ced3f9cd90179ed73bcdc9b2tree | snapshot
parent7686ad5606f08d9dfb33a2087a36c8366366015bcommit | diff
V4L/DVB (8559a): Fix a merge conflict at gspca/sonixb

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/video/gspca/sonixb.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.