Add myself as maintainer. Signed-off-by: Corentin Labbe <cla...@baylibre.com> --- Documentation/media/v4l-drivers/zoran.rst | 22 +++++++--------------- MAINTAINERS | 10 ++++++++++ drivers/staging/media/zoran/zoran_card.c | 5 ----- drivers/staging/media/zoran/zoran_card.h | 5 ----- drivers/staging/media/zoran/zoran_device.c | 5 ----- drivers/staging/media/zoran/zoran_device.h | 5 ----- 6 files changed, 17 insertions(+), 35 deletions(-)
diff --git a/Documentation/media/v4l-drivers/zoran.rst b/Documentation/media/v4l-drivers/zoran.rst index d2724a863d1d..a0586514cd8a 100644 --- a/Documentation/media/v4l-drivers/zoran.rst +++ b/Documentation/media/v4l-drivers/zoran.rst @@ -549,21 +549,13 @@ at high verbosity. See 'Contacting' on how to contact the developers. Maintainers/Contacting ---------------------- -The driver is currently maintained by Laurent Pinchart and Ronald Bultje -(<laurent.pinch...@skynet.be> and <rbul...@ronald.bitfreak.net>). For bug -reports or questions, please contact the mailinglist instead of the developers -individually. For user questions (i.e. bug reports or how-to questions), send -an email to <mjpeg-us...@lists.sf.net>, for developers (i.e. if you want to -help programming), send an email to <mjpeg-develo...@lists.sf.net>. See -http://www.sf.net/projects/mjpeg/ for subscription information. - -For bug reports, be sure to include all the information as described in -the section 'It hangs/crashes/fails/whatevers! Help!'. Please make sure -you're using the latest version (http://mjpeg.sf.net/driver-zoran/). - -Previous maintainers/developers of this driver include Serguei Miridonov -<mir...@cicese.mx>, Wolfgang Scherr <sch...@net4you.net>, Dave Perks -<dpe...@ibm.net> and Rainer Johanni <rai...@johanni.de>. +Previous maintainers/developers of this driver are +- Laurent Pinchart <laurent.pinch...@skynet.be> +- Ronald Bultje rbul...@ronald.bitfreak.net +- Serguei Miridonov <mir...@cicese.mx> +- Wolfgang Scherr <sch...@net4you.net> +- Dave Perks <dpe...@ibm.net> +- Rainer Johanni <rai...@johanni.de> Driver's License ---------------- diff --git a/MAINTAINERS b/MAINTAINERS index d3126fc2cca2..f2ece9826be3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -19233,6 +19233,16 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git F: Documentation/filesystems/zonefs.rst F: fs/zonefs/ +ZR36067 VIDEO FOR LINUX DRIVER +M: Corentin Labbe <cla...@baylibre.com> +L: mjpeg-us...@lists.sourceforge.net +L: linux-me...@vger.kernel.org +S: Maintained +W: http://mjpeg.sourceforge.net/driver-zoran/ +Q: https://patchwork.linuxtv.org/project/linux-media/list/ +F: drivers/staging/media/zoran/ +F: Documentation/media/v4l-drivers/zoran.rst + ZPOOL COMPRESSED PAGE STORAGE API M: Dan Streetman <ddstr...@ieee.org> L: linux...@kvack.org diff --git a/drivers/staging/media/zoran/zoran_card.c b/drivers/staging/media/zoran/zoran_card.c index ea10523194e8..d2f82894e8ee 100644 --- a/drivers/staging/media/zoran/zoran_card.c +++ b/drivers/staging/media/zoran/zoran_card.c @@ -7,11 +7,6 @@ * * Copyright (C) 2000 Serguei Miridonov <mir...@cicese.mx> * - * Currently maintained by: - * Ronald Bultje <rbul...@ronald.bitfreak.net> - * Laurent Pinchart <laurent.pinch...@skynet.be> - * Mailinglist <mjpeg-us...@lists.sf.net> - * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/drivers/staging/media/zoran/zoran_card.h b/drivers/staging/media/zoran/zoran_card.h index 0cdb7d34926d..53ed511ce546 100644 --- a/drivers/staging/media/zoran/zoran_card.h +++ b/drivers/staging/media/zoran/zoran_card.h @@ -7,11 +7,6 @@ * * Copyright (C) 2000 Serguei Miridonov <mir...@cicese.mx> * - * Currently maintained by: - * Ronald Bultje <rbul...@ronald.bitfreak.net> - * Laurent Pinchart <laurent.pinch...@skynet.be> - * Mailinglist <mjpeg-us...@lists.sf.net> - * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/drivers/staging/media/zoran/zoran_device.c b/drivers/staging/media/zoran/zoran_device.c index 22b27632762d..04162be80420 100644 --- a/drivers/staging/media/zoran/zoran_device.c +++ b/drivers/staging/media/zoran/zoran_device.c @@ -7,11 +7,6 @@ * * Copyright (C) 2000 Serguei Miridonov <mir...@cicese.mx> * - * Currently maintained by: - * Ronald Bultje <rbul...@ronald.bitfreak.net> - * Laurent Pinchart <laurent.pinch...@skynet.be> - * Mailinglist <mjpeg-us...@lists.sf.net> - * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/drivers/staging/media/zoran/zoran_device.h b/drivers/staging/media/zoran/zoran_device.h index a507aaad4ebb..816d48b09be9 100644 --- a/drivers/staging/media/zoran/zoran_device.h +++ b/drivers/staging/media/zoran/zoran_device.h @@ -7,11 +7,6 @@ * * Copyright (C) 2000 Serguei Miridonov <mir...@cicese.mx> * - * Currently maintained by: - * Ronald Bultje <rbul...@ronald.bitfreak.net> - * Laurent Pinchart <laurent.pinch...@skynet.be> - * Mailinglist <mjpeg-us...@lists.sf.net> - * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or -- 2.26.2
