summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-07-27 08:55:17 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-27 12:24:02 -0300
commit9fa0f6db3a201bef49f28e69f80802559a38586b (patch)
tree858548b44a2f218a754b8b0506d1a75c1280732e /MAINTAINERS
parent74b9ef21162fd81d9de87319c4373f523e2869cd (diff)
downloadop-kernel-dev-9fa0f6db3a201bef49f28e69f80802559a38586b.zip
op-kernel-dev-9fa0f6db3a201bef49f28e69f80802559a38586b.tar.gz
V4L/DVB (8522): videodev2: Fix merge conflict
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud