diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-11-04 17:11:43 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-05 23:41:11 +0300 |
| commit | 648732fcefa73932ae8caa8bcfd262863904dd66 (patch) | |
| tree | 51da4f1481bbbf9eee6c14ca8fb5c78e3028448e /drivers/media/video/davinci/vpfe_capture.c | |
| parent | 26b9d6c0b0e91c84b4713da5abd16baef3963d33 (diff) | |
| download | linux-648732fcefa73932ae8caa8bcfd262863904dd66.tar.xz | |
V4L/DVB (13271a): Fix a badly solved merge conflict
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/davinci/vpfe_capture.c')
0 files changed, 0 insertions, 0 deletions