diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 19:10:09 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-02 17:12:38 -0200 |
| commit | b0c4be8cffb3f466759ddf621a74a10093537521 (patch) | |
| tree | b657a2aea55ec51eade62c713ac4c5f361ce234f /drivers/media/video/zoran/zoran.h | |
| parent | 47aeba5addd88b178438ba9000600b9844ca0ee1 (diff) | |
V4L/DVB (10154): saa7134: fix a merge conflict on Behold H6 board
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/zoran/zoran.h')
0 files changed, 0 insertions, 0 deletions