From: Mauro Carvalho Chehab Date: Sun, 27 Jul 2008 11:55:17 +0000 (-0300) Subject: V4L/DVB (8522): videodev2: Fix merge conflict X-Git-Tag: v2.6.27-rc1~31^2~15 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fa0f6db3a201bef49f28e69f80802559a38586b;p=pandora-kernel.git V4L/DVB (8522): videodev2: Fix merge conflict Signed-off-by: Mauro Carvalho Chehab --- Reading git-diff-tree failed