From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed, 4 Nov 2009 14:11:43 +0000 (-0200)
Subject: V4L/DVB (13271a): Fix a badly solved merge conflict
X-Git-Tag: v2.6.33-rc1~338^2~177
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=648732fcefa73932ae8caa8bcfd262863904dd66;p=pandora-kernel.git

V4L/DVB (13271a): Fix a badly solved merge conflict

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

Reading git-diff-tree failed