Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index fa9c49c594a1c5152a5d35a19204c29eee3b51a7..bcab816b25f49ae0a6d721da76453606bbe585d3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1219,6 +1219,8 @@ L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:     http://www.linux4sam.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git
 S:     Supported
+N:     at91
+N:     atmel
 F:     arch/arm/mach-at91/
 F:     include/soc/at91/
 F:     arch/arm/boot/dts/at91*.dts
@@ -1227,6 +1229,9 @@ F:        arch/arm/boot/dts/sama*.dts
 F:     arch/arm/boot/dts/sama*.dtsi
 F:     arch/arm/include/debug/at91.S
 F:     drivers/memory/atmel*
+F:     drivers/watchdog/sama5d4_wdt.c
+X:     drivers/input/touchscreen/atmel_mxt_ts.c
+X:     drivers/net/wireless/atmel/
 
 ARM/CALXEDA HIGHBANK ARCHITECTURE
 M:     Rob Herring <robh@kernel.org>
@@ -1761,6 +1766,7 @@ Q:        http://patchwork.kernel.org/project/linux-renesas-soc/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
 S:     Supported
 F:     arch/arm64/boot/dts/renesas/
+F:     Documentation/devicetree/bindings/arm/shmobile.txt
 F:     drivers/soc/renesas/
 F:     include/linux/soc/renesas/
 
@@ -1880,6 +1886,7 @@ F:        arch/arm/boot/dts/sh*
 F:     arch/arm/configs/shmobile_defconfig
 F:     arch/arm/include/debug/renesas-scif.S
 F:     arch/arm/mach-shmobile/
+F:     Documentation/devicetree/bindings/arm/shmobile.txt
 F:     drivers/soc/renesas/
 F:     include/linux/soc/renesas/
 
@@ -2139,7 +2146,6 @@ F:        drivers/gpio/gpio-zx.c
 F:     drivers/i2c/busses/i2c-zx2967.c
 F:     drivers/mmc/host/dw_mmc-zx.*
 F:     drivers/pinctrl/zte/
-F:     drivers/reset/reset-zx2967.c
 F:     drivers/soc/zte/
 F:     drivers/thermal/zx2967_thermal.c
 F:     drivers/watchdog/zx2967_wdt.c
@@ -2162,7 +2168,6 @@ F:        sound/soc/zte/
 
 ARM/ZYNQ ARCHITECTURE
 M:     Michal Simek <michal.simek@xilinx.com>
-R:     Sören Brinkmann <soren.brinkmann@xilinx.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:     http://wiki.xilinx.com
 T:     git https://github.com/Xilinx/linux-xlnx.git
@@ -2937,6 +2942,7 @@ N:        bcm583*
 N:     bcm585*
 N:     bcm586*
 N:     bcm88312
+N:     hr2
 F:     arch/arm64/boot/dts/broadcom/ns2*
 F:     drivers/clk/bcm/clk-ns*
 F:     drivers/pinctrl/bcm/pinctrl-ns*
@@ -2980,6 +2986,14 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt
 F:     drivers/cpufreq/brcmstb*
 
+BROADCOM STB AVS TMON DRIVER
+M:     Markus Mayer <mmayer@broadcom.com>
+M:     bcm-kernel-feedback-list@broadcom.com
+L:     linux-pm@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/thermal/brcm,avs-tmon.txt
+F:     drivers/thermal/broadcom/brcmstb*
+
 BROADCOM STB NAND FLASH DRIVER
 M:     Brian Norris <computersforpeace@gmail.com>
 M:     Kamal Dasu <kdasu.kdev@gmail.com>
@@ -2988,6 +3002,14 @@ L:       bcm-kernel-feedback-list@broadcom.com
 S:     Maintained
 F:     drivers/mtd/nand/brcmnand/
 
+BROADCOM STB DPFE DRIVER
+M:     Markus Mayer <mmayer@broadcom.com>
+M:     bcm-kernel-feedback-list@broadcom.com
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+F:     Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.txt
+F:     drivers/memory/brcmstb_dpfe.c
+
 BROADCOM SYSTEMPORT ETHERNET DRIVER
 M:     Florian Fainelli <f.fainelli@gmail.com>
 L:     netdev@vger.kernel.org
@@ -3706,8 +3728,8 @@ F:        drivers/cpuidle/*
 F:     include/linux/cpuidle.h
 
 CRAMFS FILESYSTEM
-W:     http://sourceforge.net/projects/cramfs/
-S:     Orphan / Obsolete
+M:     Nicolas Pitre <nico@linaro.org>
+S:     Maintained
 F:     Documentation/filesystems/cramfs.txt
 F:     fs/cramfs/
 
@@ -4194,7 +4216,7 @@ L:        linux-i2c@vger.kernel.org
 S:     Maintained
 F:     drivers/i2c/busses/i2c-diolan-u2c.c
 
-DIRECT ACCESS (DAX)
+FILESYSTEM DIRECT ACCESS (DAX)
 M:     Matthew Wilcox <mawilcox@microsoft.com>
 M:     Ross Zwisler <ross.zwisler@linux.intel.com>
 L:     linux-fsdevel@vger.kernel.org
@@ -4203,6 +4225,12 @@ F:       fs/dax.c
 F:     include/linux/dax.h
 F:     include/trace/events/fs_dax.h
 
+DEVICE DIRECT ACCESS (DAX)
+M:     Dan Williams <dan.j.williams@intel.com>
+L:     linux-nvdimm@lists.01.org
+S:     Supported
+F:     drivers/dax/
+
 DIRECTORY NOTIFICATION (DNOTIFY)
 M:     Jan Kara <jack@suse.cz>
 R:     Amir Goldstein <amir73il@gmail.com>
@@ -5196,7 +5224,7 @@ F:        drivers/video/fbdev/s1d13xxxfb.c
 F:     include/video/s1d13xxxfb.h
 
 ERRSEQ ERROR TRACKING INFRASTRUCTURE
-M:     Jeff Layton <jlayton@poochiereds.net>
+M:     Jeff Layton <jlayton@kernel.org>
 S:     Maintained
 F:     lib/errseq.c
 F:     include/linux/errseq.h
@@ -5384,7 +5412,7 @@ F:        include/scsi/libfcoe.h
 F:     include/uapi/scsi/fc/
 
 FILE LOCKING (flock() and fcntl()/lockf())
-M:     Jeff Layton <jlayton@poochiereds.net>
+M:     Jeff Layton <jlayton@kernel.org>
 M:     "J. Bruce Fields" <bfields@fieldses.org>
 L:     linux-fsdevel@vger.kernel.org
 S:     Maintained
@@ -6827,6 +6855,7 @@ F:        drivers/ipack/
 
 INFINIBAND SUBSYSTEM
 M:     Doug Ledford <dledford@redhat.com>
+M:     Jason Gunthorpe <jgg@mellanox.com>
 L:     linux-rdma@vger.kernel.org
 W:     http://www.openfabrics.org/
 Q:     http://patchwork.kernel.org/project/linux-rdma/list/
@@ -7529,7 +7558,7 @@ S:        Odd Fixes
 
 KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
 M:     "J. Bruce Fields" <bfields@fieldses.org>
-M:     Jeff Layton <jlayton@poochiereds.net>
+M:     Jeff Layton <jlayton@kernel.org>
 L:     linux-nfs@vger.kernel.org
 W:     http://nfs.sourceforge.net/
 T:     git git://linux-nfs.org/~bfields/linux.git
@@ -7650,6 +7679,7 @@ S:        Supported
 F:     arch/x86/kvm/
 F:     arch/x86/include/uapi/asm/kvm*
 F:     arch/x86/include/asm/kvm*
+F:     arch/x86/include/asm/pvclock-abi.h
 F:     arch/x86/kernel/kvm.c
 F:     arch/x86/kernel/kvmclock.c
 
@@ -10713,6 +10743,7 @@ PIN CONTROLLER - RENESAS
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 M:     Geert Uytterhoeven <geert+renesas@glider.be>
 L:     linux-renesas-soc@vger.kernel.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git sh-pfc
 S:     Maintained
 F:     drivers/pinctrl/sh-pfc/
 
@@ -13000,6 +13031,12 @@ F:     arch/arc/plat-axs10x
 F:     arch/arc/boot/dts/ax*
 F:     Documentation/devicetree/bindings/arc/axs10*
 
+SYNOPSYS AXS10x RESET CONTROLLER DRIVER
+M:     Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
+S:     Supported
+F:     drivers/reset/reset-axs10x.c
+F:     Documentation/devicetree/bindings/reset/snps,axs10x-reset.txt
+
 SYNOPSYS DESIGNWARE APB GPIO DRIVER
 M:     Hoan Tran <hotran@apm.com>
 L:     linux-gpio@vger.kernel.org
@@ -14837,6 +14874,7 @@ F:      arch/x86/xen/
 F:     drivers/*/xen-*front.c
 F:     drivers/xen/
 F:     arch/x86/include/asm/xen/
+F:     arch/x86/include/asm/pvclock-abi.h
 F:     include/xen/
 F:     include/uapi/xen/
 F:     Documentation/ABI/stable/sysfs-hypervisor-xen