diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 23:10:09 +0100 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-02 20:12:38 +0100 |
commit | b0c4be8cffb3f466759ddf621a74a10093537521 (patch) | |
tree | b657a2aea55ec51eade62c713ac4c5f361ce234f /drivers/media/video/saa7134/saa7134-cards.c | |
parent | V4L/DVB (10153): Add the Beholder H6 card to DVB-T part of sources. (diff) | |
download | linux-b0c4be8cffb3f466759ddf621a74a10093537521.tar.xz linux-b0c4be8cffb3f466759ddf621a74a10093537521.zip |
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/saa7134/saa7134-cards.c')
0 files changed, 0 insertions, 0 deletions