Merge tag 'pci-v5.1-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 21ab06488be884bf2bf90027bc7a39777d4c015f..3cec1cfd2a53edf56d7a5db10c49861ab6c9f185 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2140,8 +2140,9 @@ F:        drivers/media/platform/s5p-cec/
 F:     Documentation/devicetree/bindings/media/s5p-cec.txt
 
 ARM/SAMSUNG S5P SERIES JPEG CODEC SUPPORT
-M:     Andrzej Pietrasiewicz <andrzej.p@samsung.com>
+M:     Andrzej Pietrasiewicz <andrzejtp2010@gmail.com>
 M:     Jacek Anaszewski <jacek.anaszewski@gmail.com>
+M:     Sylwester Nawrocki <s.nawrocki@samsung.com>
 L:     linux-arm-kernel@lists.infradead.org
 L:     linux-media@vger.kernel.org
 S:     Maintained
@@ -6337,9 +6338,10 @@ F:       include/linux/fscache*.h
 FSCRYPT: FILE SYSTEM LEVEL ENCRYPTION SUPPORT
 M:     Theodore Y. Ts'o <tytso@mit.edu>
 M:     Jaegeuk Kim <jaegeuk@kernel.org>
+M:     Eric Biggers <ebiggers@kernel.org>
 L:     linux-fscrypt@vger.kernel.org
 Q:     https://patchwork.kernel.org/project/linux-fscrypt/list/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git
+T:     git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git
 S:     Supported
 F:     fs/crypto/
 F:     include/linux/fscrypt*.h
@@ -7851,7 +7853,6 @@ M:        Yong Zhi <yong.zhi@intel.com>
 M:     Sakari Ailus <sakari.ailus@linux.intel.com>
 M:     Bingbu Cao <bingbu.cao@intel.com>
 R:     Tian Shu Qiu <tian.shu.qiu@intel.com>
-R:     Jian Xu Zheng <jian.xu.zheng@intel.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 F:     drivers/media/pci/intel/ipu3/
@@ -8564,7 +8565,7 @@ F:        security/keys/encrypted-keys/
 KEYS-TRUSTED
 M:     James Bottomley <jejb@linux.ibm.com>
 M:      Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
-M:     Mimi Zohar <zohar@linuxibm.com>
+M:     Mimi Zohar <zohar@linux.ibm.com>
 L:     linux-integrity@vger.kernel.org
 L:     keyrings@vger.kernel.org
 S:     Supported
@@ -9525,6 +9526,17 @@ T:       git git://linuxtv.org/media_tree.git
 S:     Maintained
 F:     drivers/media/platform/imx-pxp.[ch]
 
+MEDIA DRIVERS FOR FREESCALE IMX7
+M:     Rui Miguel Silva <rmfrfs@gmail.com>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+S:     Maintained
+F:     Documentation/devicetree/bindings/media/imx7-csi.txt
+F:     Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt
+F:     Documentation/media/v4l-drivers/imx7.rst
+F:     drivers/staging/media/imx/imx7-media-csi.c
+F:     drivers/staging/media/imx/imx7-mipi-csis.c
+
 MEDIA DRIVERS FOR HELENE
 M:     Abylay Ospan <aospan@netup.ru>
 L:     linux-media@vger.kernel.org
@@ -11440,6 +11452,19 @@ S:     Maintained
 F:     drivers/media/i2c/ov7740.c
 F:     Documentation/devicetree/bindings/media/i2c/ov7740.txt
 
+OMNIVISION OV9640 SENSOR DRIVER
+M:     Petr Cvek <petrcvekcz@gmail.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     drivers/media/i2c/ov9640.*
+
+OMNIVISION OV8856 SENSOR DRIVER
+M:     Ben Kao <ben.kao@intel.com>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+S:     Maintained
+F:     drivers/media/i2c/ov8856.c
+
 OMNIVISION OV9650 SENSOR DRIVER
 M:     Sakari Ailus <sakari.ailus@linux.intel.com>
 R:     Akinobu Mita <akinobu.mita@gmail.com>
@@ -11805,7 +11830,7 @@ F:      Documentation/devicetree/bindings/pci/pci-armada8k.txt
 F:     drivers/pci/controller/dwc/pcie-armada8k.c
 
 PCI DRIVER FOR CADENCE PCIE IP
-M:     Alan Douglas <adouglas@cadence.com>
+M:     Tom Joseph <tjoseph@cadence.com>
 L:     linux-pci@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/pci/cdns,*.txt
@@ -12584,6 +12609,7 @@ L:      linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 S:     Odd Fixes
 F:     drivers/media/usb/pwc/*
+F:     include/trace/events/pwc.h
 
 PWM FAN DRIVER
 M:     Kamil Debski <kamil@wypas.org>
@@ -16763,6 +16789,11 @@ M:     David Härdeman <david@hardeman.nu>
 S:     Maintained
 F:     drivers/media/rc/winbond-cir.c
 
+RCMM REMOTE CONTROLS DECODER
+M:     Patrick Lerda <patrick9876@free.fr>
+S:     Maintained
+F:     drivers/media/rc/ir-rcmm-decoder.c
+
 WINSYSTEMS EBC-C384 WATCHDOG DRIVER
 M:     William Breathitt Gray <vilhelm.gray@gmail.com>
 L:     linux-watchdog@vger.kernel.org