Merge tag 'staging-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-drm-fsl-dcu.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index c4a8703ab493da94d60b847cfdc4139d4df43bbc..348f5c16ef503460e72f68e3f55e624cf9ebd485 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1173,6 +1173,7 @@ M:        Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mach-mvebu/
+F:     drivers/rtc/armada38x-rtc
 
 ARM/Marvell Berlin SoC support
 M:     Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
@@ -1606,6 +1607,7 @@ M:        Will Deacon <will.deacon@arm.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     drivers/iommu/arm-smmu.c
+F:     drivers/iommu/io-pgtable-arm.c
 
 ARM64 PORT (AARCH64 ARCHITECTURE)
 M:     Catalin Marinas <catalin.marinas@arm.com>
@@ -2397,6 +2399,12 @@ F:       security/capability.c
 F:     security/commoncap.c
 F:     kernel/capability.c
 
+CAPELLA MICROSYSTEMS LIGHT SENSOR DRIVER
+M:     Kevin Tsai <ktsai@capellamicro.com>
+S:     Maintained
+F:     drivers/iio/light/cm*
+F:     Documentation/devicetree/bindings/i2c/trivial-devices.txt
+
 CC2520 IEEE-802.15.4 RADIO DRIVER
 M:     Varka Bhadram <varkabhadram@gmail.com>
 L:     linux-wpan@vger.kernel.org
@@ -3031,6 +3039,7 @@ F:        drivers/platform/x86/dell-laptop.c
 
 DELL LAPTOP SMM DRIVER
 M:     Guenter Roeck <linux@roeck-us.net>
+S:     Maintained
 F:     drivers/char/i8k.c
 F:     include/uapi/linux/i8k.h
 
@@ -3046,7 +3055,7 @@ S:        Maintained
 F:     drivers/platform/x86/dell-wmi.c
 
 DESIGNWARE USB2 DRD IP DRIVER
-M:     Paul Zimmerman <paulz@synopsys.com>
+M:     John Youn <johnyoun@synopsys.com>
 L:     linux-usb@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
 S:     Maintained
@@ -3901,6 +3910,12 @@ S:       Supported
 F:     Documentation/fault-injection/
 F:     lib/fault-inject.c
 
+FBTFT Framebuffer drivers
+M:     Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+M:     Noralf Trønnes <noralf@tronnes.org>
+S:     Maintained
+F:     drivers/staging/fbtft/
+
 FCOE SUBSYSTEM (libfc, libfcoe, fcoe)
 M:     Robert Love <robert.w.love@intel.com>
 L:     fcoe-devel@open-fcoe.org
@@ -4432,6 +4447,7 @@ F:        include/linux/hwmon*.h
 HARDWARE RANDOM NUMBER GENERATOR CORE
 M:     Matt Mackall <mpm@selenic.com>
 M:     Herbert Xu <herbert@gondor.apana.org.au>
+L:     linux-crypto@vger.kernel.org
 S:     Odd fixes
 F:     Documentation/hw_random.txt
 F:     drivers/char/hw_random/
@@ -6641,9 +6657,10 @@ F:       include/uapi/linux/netrom.h
 F:     net/netrom/
 
 NETWORK BLOCK DEVICE (NBD)
-M:     Paul Clements <Paul.Clements@steeleye.com>
+M:     Markus Pargmann <mpa@pengutronix.de>
 S:     Maintained
 L:     nbd-general@lists.sourceforge.net
+T:     git git://git.pengutronix.de/git/mpa/linux-nbd.git
 F:     Documentation/blockdev/nbd.txt
 F:     drivers/block/nbd.c
 F:     include/linux/nbd.h
@@ -9257,6 +9274,14 @@ L:       linux-wireless@vger.kernel.org
 S:     Maintained
 F:     drivers/staging/rtl8723au/
 
+STAGING - SILICON MOTION SM7XX FRAME BUFFER DRIVER
+M:     Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+M:     Teddy Wang <teddy.wang@siliconmotion.com>
+M:     Sudip Mukherjee <sudip@vectorindia.org>
+L:     linux-fbdev@vger.kernel.org
+S:     Maintained
+F:     drivers/staging/sm7xxfb/
+
 STAGING - SLICOSS
 M:     Lior Dotan <liodot@gmail.com>
 M:     Christopher Harrer <charrer@alacritech.com>
@@ -9724,7 +9749,7 @@ F:        net/tipc/
 
 TILE ARCHITECTURE
 M:     Chris Metcalf <cmetcalf@ezchip.com>
-W:     http://www.tilera.com/scm/
+W:     http://www.ezchip.com/scm/
 S:     Supported
 F:     arch/tile/
 F:     drivers/char/tile-srom.c
@@ -9986,20 +10011,15 @@ F:     drivers/scsi/ufs/
 
 UNSORTED BLOCK IMAGES (UBI)
 M:     Artem Bityutskiy <dedekind1@gmail.com>
+M:     Richard Weinberger <richard@nod.at>
 W:     http://www.linux-mtd.infradead.org/
 L:     linux-mtd@lists.infradead.org
 T:     git git://git.infradead.org/ubifs-2.6.git
-S:     Maintained
+S:     Supported
 F:     drivers/mtd/ubi/
 F:     include/linux/mtd/ubi.h
 F:     include/uapi/mtd/ubi-user.h
 
-UNSORTED BLOCK IMAGES (UBI) Fastmap
-M:     Richard Weinberger <richard@nod.at>
-L:     linux-mtd@lists.infradead.org
-S:     Maintained
-F:     drivers/mtd/ubi/fastmap.c
-
 USB ACM DRIVER
 M:     Oliver Neukum <oliver@neukum.org>
 L:     linux-usb@vger.kernel.org
@@ -10689,6 +10709,7 @@ F:      drivers/pci/*xen*
 
 XEN BLOCK SUBSYSTEM
 M:     Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+M:     Roger Pau Monné <roger.pau@citrix.com>
 L:     xen-devel@lists.xenproject.org (moderated for non-subscribers)
 S:     Supported
 F:     drivers/block/xen-blkback/*