From: Mauro Carvalho Chehab Date: Sat, 9 Oct 2010 19:43:40 +0000 (-0300) Subject: V4L/DVB: Fix a merge conflict that affects unlock_ioctl X-Git-Tag: v2.6.37-rc1~64^2~309 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7242063018c06977dc6825026b3075076e6f227b;p=pandora-kernel.git V4L/DVB: Fix a merge conflict that affects unlock_ioctl Signed-off-by: Mauro Carvalho Chehab --- Reading git-diff-tree failed