| commit | b0c4be8cffb3f466759ddf621a74a10093537521 | [log] [tgz] |
|---|---|---|
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | Tue Dec 30 19:10:09 2008 -0300 |
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | Fri Jan 02 17:12:38 2009 -0200 |
| tree | b657a2aea55ec51eade62c713ac4c5f361ce234f | |
| parent | 47aeba5addd88b178438ba9000600b9844ca0ee1 [diff] |
V4L/DVB (10154): saa7134: fix a merge conflict on Behold H6 board Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>