From: Mauro Carvalho Chehab Date: Tue, 30 Dec 2008 22:10:09 +0000 (-0300) Subject: V4L/DVB (10154): saa7134: fix a merge conflict on Behold H6 board X-Git-Tag: v2.6.29-rc1~523^2~16 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0c4be8cffb3f466759ddf621a74a10093537521;p=pandora-kernel.git V4L/DVB (10154): saa7134: fix a merge conflict on Behold H6 board Signed-off-by: Mauro Carvalho Chehab --- Reading git-diff-tree failed