From: Mauro Carvalho Chehab Date: Wed, 6 Aug 2008 23:13:46 +0000 (-0300) Subject: V4L/DVB (8559a): Fix a merge conflict at gspca/sonixb X-Git-Tag: v2.6.27-rc9~6^2~32 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2389b36072892fed57a701e01a7dbe655420e5e5;p=pandora-kernel.git V4L/DVB (8559a): Fix a merge conflict at gspca/sonixb Signed-off-by: Mauro Carvalho Chehab --- Reading git-diff-tree failed