Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 3838c94a0d47670167151c7c9389bd7a7b33c95f..2648f311311555e046393086f8a5f34aadf07003 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -796,6 +796,14 @@ M: Michael Hanselmann <linux-kernel@hansmi.ch>
 S:     Supported
 F:     drivers/macintosh/ams/
 
+ANALOG DEVICES INC AD5686 DRIVER
+M:     Stefan Popa <stefan.popa@analog.com>
+L:     linux-pm@vger.kernel.org
+W:     http://ez.analog.com/community/linux-device-drivers
+S:     Supported
+F:     drivers/iio/dac/ad5686*
+F:     drivers/iio/dac/ad5696*
+
 ANALOG DEVICES INC AD9389B DRIVER
 M:     Hans Verkuil <hans.verkuil@cisco.com>
 L:     linux-media@vger.kernel.org
@@ -4421,6 +4429,12 @@ L:       linux-kernel@vger.kernel.org
 S:     Maintained
 F:     drivers/staging/fsl-dpaa2/ethsw
 
+DPAA2 PTP CLOCK DRIVER
+M:     Yangbo Lu <yangbo.lu@nxp.com>
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+F:     drivers/staging/fsl-dpaa2/rtc
+
 DPT_I2O SCSI RAID DRIVER
 M:     Adaptec OEM Raid Solutions <aacraid@microsemi.com>
 L:     linux-scsi@vger.kernel.org
@@ -6968,6 +6982,15 @@ F:       drivers/staging/iio/
 F:     include/linux/iio/
 F:     tools/iio/
 
+IIO UNIT CONVERTER
+M:     Peter Rosin <peda@axentia.se>
+L:     linux-iio@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/iio/afe/current-sense-amplifier.txt
+F:     Documentation/devicetree/bindings/iio/afe/current-sense-shunt.txt
+F:     Documentation/devicetree/bindings/iio/afe/voltage-divider.txt
+F:     drivers/iio/afe/iio-rescale.c
+
 IKANOS/ADI EAGLE ADSL USB DRIVER
 M:     Matthieu Castet <castet.matthieu@free.fr>
 M:     Stanislaw Gruszka <stf_xl@wp.pl>
@@ -11790,6 +11813,14 @@ T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.g
 S:     Supported
 F:     arch/hexagon/
 
+QUALCOMM HIDMA DRIVER
+M:     Sinan Kaya <okaya@codeaurora.org>
+L:     linux-arm-kernel@lists.infradead.org
+L:     linux-arm-msm@vger.kernel.org
+L:     dmaengine@vger.kernel.org
+S:     Supported
+F:     drivers/dma/qcom/hidma*
+
 QUALCOMM IOMMU
 M:     Rob Clark <robdclark@gmail.com>
 L:     iommu@lists.linux-foundation.org
@@ -13425,15 +13456,6 @@ S:     Odd Fixes
 F:     Documentation/devicetree/bindings/staging/iio/
 F:     drivers/staging/iio/
 
-STAGING - LUSTRE PARALLEL FILESYSTEM
-M:     Oleg Drokin <oleg.drokin@intel.com>
-M:     Andreas Dilger <andreas.dilger@intel.com>
-M:     James Simmons <jsimmons@infradead.org>
-L:     lustre-devel@lists.lustre.org (moderated for non-subscribers)
-W:     http://wiki.lustre.org/
-S:     Maintained
-F:     drivers/staging/lustre
-
 STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec)
 M:     Marc Dietrich <marvin24@gmx.de>
 L:     ac100@lists.launchpad.net (moderated for non-subscribers)
@@ -13601,6 +13623,12 @@ S:     Supported
 F:     net/switchdev/
 F:     include/net/switchdev.h
 
+SY8106A REGULATOR DRIVER
+M:     Icenowy Zheng <icenowy@aosc.io>
+S:     Maintained
+F:     drivers/regulator/sy8106a-regulator.c
+F:     Documentation/devicetree/bindings/regulator/sy8106a-regulator.txt
+
 SYNC FILE FRAMEWORK
 M:     Sumit Semwal <sumit.semwal@linaro.org>
 R:     Gustavo Padovan <gustavo@padovan.org>