Merge tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
[linux-2.6-block.git] / MAINTAINERS
index d5506eca7fb2d4a299a5b870838cef03ca377686..bc93927db022124006827237a96759d12ab9f1f5 100644 (file)
@@ -1233,6 +1233,13 @@ ARM/LPC18XX ARCHITECTURE
 M:     Joachim Eastwood <manabian@gmail.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
+F:     arch/arm/boot/dts/lpc43*
+F:     drivers/clk/nxp/clk-lpc18xx*
+F:     drivers/clocksource/time-lpc32xx.c
+F:     drivers/i2c/busses/i2c-lpc2k.c
+F:     drivers/memory/pl172.c
+F:     drivers/mtd/spi-nor/nxp-spifi.c
+F:     drivers/rtc/rtc-lpc24xx.c
 N:     lpc18xx
 
 ARM/MAGICIAN MACHINE SUPPORT
@@ -1626,6 +1633,7 @@ L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/boot/dts/uniphier*
 F:     arch/arm/mach-uniphier/
+F:     drivers/i2c/busses/i2c-uniphier*
 F:     drivers/pinctrl/uniphier/
 F:     drivers/tty/serial/8250/8250_uniphier.c
 N:     uniphier
@@ -2387,19 +2395,27 @@ L:      linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/bnx2i/
 
-BROADCOM CYGNUS/IPROC ARM ARCHITECTURE
+BROADCOM IPROC ARM ARCHITECTURE
 M:     Ray Jui <rjui@broadcom.com>
 M:     Scott Branden <sbranden@broadcom.com>
+M:     Jon Mason <jonmason@broadcom.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     bcm-kernel-feedback-list@broadcom.com
 T:     git git://github.com/broadcom/cygnus-linux.git
 S:     Maintained
 N:     iproc
 N:     cygnus
+N:     nsp
 N:     bcm9113*
 N:     bcm9583*
-N:     bcm583*
+N:     bcm9585*
+N:     bcm9586*
+N:     bcm988312
 N:     bcm113*
+N:     bcm583*
+N:     bcm585*
+N:     bcm586*
+N:     bcm88312
 
 BROADCOM BRCMSTB GPIO DRIVER
 M:     Gregory Fong <gregory.0xf0@gmail.com>
@@ -2757,9 +2773,10 @@ S:       Supported
 F:     drivers/net/ethernet/cisco/enic/
 
 CISCO VIC LOW LATENCY NIC DRIVER
-M:     Upinder Malhi <umalhi@cisco.com>
+M:     Christian Benvenuti <benve@cisco.com>
+M:     Dave Goodell <dgoodell@cisco.com>
 S:     Supported
-F:     drivers/infiniband/hw/usnic
+F:     drivers/infiniband/hw/usnic/
 
 CIRRUS LOGIC EP93XX ETHERNET DRIVER
 M:     Hartley Sweeten <hsweeten@visionengravers.com>
@@ -3616,13 +3633,14 @@ S:      Maintained
 F:     drivers/gpu/drm/drm_panel.c
 F:     drivers/gpu/drm/panel/
 F:     include/drm/drm_panel.h
-F:     Documentation/devicetree/bindings/panel/
+F:     Documentation/devicetree/bindings/display/panel/
 
 INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
 M:     Daniel Vetter <daniel.vetter@intel.com>
 M:     Jani Nikula <jani.nikula@linux.intel.com>
 L:     intel-gfx@lists.freedesktop.org
 L:     dri-devel@lists.freedesktop.org
+W:     https://01.org/linuxgraphics/
 Q:     http://patchwork.freedesktop.org/project/intel-gfx/
 T:     git git://anongit.freedesktop.org/drm-intel
 S:     Supported
@@ -3655,15 +3673,16 @@ M:      Alison Wang <alison.wang@freescale.com>
 L:     dri-devel@lists.freedesktop.org
 S:     Supported
 F:     drivers/gpu/drm/fsl-dcu/
-F:     Documentation/devicetree/bindings/video/fsl,dcu.txt
-F:     Documentation/devicetree/bindings/panel/nec,nl4827hc19_05b.txt
+F:     Documentation/devicetree/bindings/display/fsl,dcu.txt
+F:     Documentation/devicetree/bindings/display/panel/nec,nl4827hc19_05b.txt
 
 DRM DRIVERS FOR FREESCALE IMX
 M:     Philipp Zabel <p.zabel@pengutronix.de>
 L:     dri-devel@lists.freedesktop.org
 S:     Maintained
 F:     drivers/gpu/drm/imx/
-F:     Documentation/devicetree/bindings/drm/imx/
+F:     drivers/gpu/ipu-v3/
+F:     Documentation/devicetree/bindings/display/imx/
 
 DRM DRIVERS FOR GMA500 (Poulsbo, Moorestown and derivative chipsets)
 M:     Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
@@ -3684,7 +3703,7 @@ F:        drivers/gpu/drm/tegra/
 F:     drivers/gpu/host1x/
 F:     include/linux/host1x.h
 F:     include/uapi/drm/tegra_drm.h
-F:     Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
+F:     Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt
 
 DRM DRIVERS FOR RENESAS
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@ -3701,7 +3720,7 @@ M:        Mark Yao <mark.yao@rock-chips.com>
 L:     dri-devel@lists.freedesktop.org
 S:     Maintained
 F:     drivers/gpu/drm/rockchip/
-F:     Documentation/devicetree/bindings/video/rockchip*
+F:     Documentation/devicetree/bindings/display/rockchip*
 
 DRM DRIVERS FOR STI
 M:     Benjamin Gaignard <benjamin.gaignard@linaro.org>
@@ -3710,7 +3729,7 @@ L:        dri-devel@lists.freedesktop.org
 T:     git http://git.linaro.org/people/benjamin.gaignard/kernel.git
 S:     Maintained
 F:     drivers/gpu/drm/sti
-F:     Documentation/devicetree/bindings/gpu/st,stih4xx.txt
+F:     Documentation/devicetree/bindings/display/st,stih4xx.txt
 
 DSBR100 USB FM RADIO DRIVER
 M:     Alexey Klimov <klimov.linux@gmail.com>
@@ -4208,7 +4227,10 @@ L:       linux-kernel@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git
 S:     Maintained
 F:     drivers/extcon/
+F:     include/linux/extcon/
+F:     include/linux/extcon.h
 F:     Documentation/extcon/
+F:     Documentation/devicetree/bindings/extcon/
 
 EXYNOS DP DRIVER
 M:     Jingoo Han <jingoohan1@gmail.com>
@@ -4403,7 +4425,6 @@ Q:        http://patchwork.kernel.org/project/linux-fbdev/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev.git
 S:     Maintained
 F:     Documentation/fb/
-F:     Documentation/devicetree/bindings/fb/
 F:     drivers/video/
 F:     include/video/
 F:     include/linux/fb.h
@@ -5158,6 +5179,7 @@ S:        Maintained
 F:     Documentation/devicetree/bindings/i2c/
 F:     Documentation/i2c/
 F:     drivers/i2c/
+F:     drivers/i2c/*/
 F:     include/linux/i2c.h
 F:     include/linux/i2c-*.h
 F:     include/uapi/linux/i2c.h
@@ -6967,6 +6989,7 @@ S:        Supported
 F:     arch/metag/
 F:     Documentation/metag/
 F:     Documentation/devicetree/bindings/metag/
+F:     Documentation/devicetree/bindings/interrupt-controller/img,*
 F:     drivers/clocksource/metag_generic.c
 F:     drivers/irqchip/irq-metag.c
 F:     drivers/irqchip/irq-metag-ext.c
@@ -7489,6 +7512,7 @@ S:        Supported
 F:     Documentation/filesystems/nilfs2.txt
 F:     fs/nilfs2/
 F:     include/linux/nilfs2_fs.h
+F:     include/trace/events/nilfs2.h
 
 NINJA SCSI-3 / NINJA SCSI-32Bi (16bit/CardBus) PCMCIA SCSI HOST ADAPTER DRIVER
 M:     YOKOTA Hiroshi <yokota@netlab.is.tsukuba.ac.jp>
@@ -8411,12 +8435,6 @@ M:       "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
 S:     Maintained
 F:     drivers/pnp/
 
-PNXxxxx I2C DRIVER
-M:     Vitaly Wool <vitalywool@gmail.com>
-L:     linux-i2c@vger.kernel.org
-S:     Maintained
-F:     drivers/i2c/busses/i2c-pnx.c
-
 PPP PROTOCOL DRIVERS AND COMPRESSORS
 M:     Paul Mackerras <paulus@samba.org>
 L:     linux-ppp@vger.kernel.org
@@ -9634,7 +9652,7 @@ SIMPLEFB FB DRIVER
 M:     Hans de Goede <hdegoede@redhat.com>
 L:     linux-fbdev@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/video/simple-framebuffer.txt
+F:     Documentation/devicetree/bindings/display/simple-framebuffer.txt
 F:     drivers/video/fbdev/simplefb.c
 F:     include/linux/platform_data/simplefb.h
 
@@ -10265,6 +10283,7 @@ L:      linux-snps-arc@lists.infraded.org
 S:     Supported
 F:     arch/arc/
 F:     Documentation/devicetree/bindings/arc/*
+F:     Documentation/devicetree/bindings/interrupt-controller/snps,arc*
 F:     drivers/tty/serial/arc_uart.c
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git
 
@@ -11270,6 +11289,12 @@ S:     Maintained
 F:     Documentation/fb/uvesafb.txt
 F:     drivers/video/fbdev/uvesafb.*
 
+VF610 NAND DRIVER
+M:     Stefan Agner <stefan@agner.ch>
+L:     linux-mtd@lists.infradead.org
+S:     Supported
+F:     drivers/mtd/nand/vf610_nfc.c
+
 VFAT/FAT/MSDOS FILESYSTEM
 M:     OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
 S:     Maintained
@@ -11300,6 +11325,12 @@ S:     Maintained
 F:     drivers/media/v4l2-core/videobuf2-*
 F:     include/media/videobuf2-*
 
+VIRTUAL SERIO DEVICE DRIVER
+M:     Stephen Chandler Paul <thatslyude@gmail.com>
+S:     Maintained
+F:     drivers/input/serio/userio.c
+F:     include/uapi/linux/userio.h
+
 VIRTIO CONSOLE DRIVER
 M:     Amit Shah <amit.shah@redhat.com>
 L:     virtualization@lists.linux-foundation.org