uthor Mauro Carvalho Chehab <mchehab@redhat.com> 1230675009 -0300
committer Mauro Carvalho Chehab <mchehab@redhat.com> 1230923558 -0200

V4L/DVB (10154): saa7134: fix a merge conflict on Behold H6 board

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
wtnó™