diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-07 01:13:46 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-11 03:54:13 +0200 |
| commit | 2389b36072892fed57a701e01a7dbe655420e5e5 (patch) | |
| tree | be25084dd56fcb36ced3f9cd90179ed73bcdc9b2 /drivers/media/video/wm8739.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto... (diff) | |
| download | linux-2389b36072892fed57a701e01a7dbe655420e5e5.tar.xz linux-2389b36072892fed57a701e01a7dbe655420e5e5.zip | |
V4L/DVB (8559a): Fix a merge conflict at gspca/sonixb
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/wm8739.c')
0 files changed, 0 insertions, 0 deletions