From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Mon, 23 May 2011 10:36:55 +0000 (-0300)
Subject: [media] DocBook: document V4L2_CTRL_TYPE_BITMASK
X-Git-Tag: v3.1-rc1~116^2~146
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aec67f054205da77f83ba52f83239225d6cbe366;p=pandora-kernel.git

[media] DocBook: document V4L2_CTRL_TYPE_BITMASK

[mchehab@redhat.com: Fix a merge conflict and make compat.xml coherent with v4l2.xml]
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

Reading git-diff-tree failed