V4L/DVB (8522): videodev2: Fix merge conflict
authorMauro Carvalho Chehab <mchehab@infradead.org>
Sun, 27 Jul 2008 11:55:17 +0000 (08:55 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Sun, 27 Jul 2008 15:24:02 +0000 (12:24 -0300)
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

No differences found