V4L/DVB (10154): saa7134: fix a merge conflict on Behold H6 board
authorMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 30 Dec 2008 22:10:09 +0000 (19:10 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 2 Jan 2009 19:12:38 +0000 (17:12 -0200)
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

No differences found