summaryrefslogtreecommitdiff
path: root/drivers/media/video/wm8739.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-08-06 20:13:46 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-09-10 22:54:13 -0300
commit2389b36072892fed57a701e01a7dbe655420e5e5 (patch)
treebe25084dd56fcb36ced3f9cd90179ed73bcdc9b2 /drivers/media/video/wm8739.c
parent7686ad5606f08d9dfb33a2087a36c8366366015b (diff)
downloadlinux-next-2389b36072892fed57a701e01a7dbe655420e5e5.tar.gz
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