Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 7172d12c2776914513989f750dc3131c0a0b8725..43898b1a8a2d0b9ece5f28a3978a22cf3f345ea6 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -564,7 +564,7 @@ L:  linux-alpha@vger.kernel.org
 F:     arch/alpha/
 
 ALTERA TRIPLE SPEED ETHERNET DRIVER
-M:     Vince Bridgers <vbridgers2013@gmail.com>
+M:     Vince Bridgers <vbridger@opensource.altera.com>
 L:     netdev@vger.kernel.org
 L:     nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
 S:     Maintained
@@ -1338,8 +1338,7 @@ ARM/SAMSUNG MOBILE MACHINE SUPPORT
 M:     Kyungmin Park <kyungmin.park@samsung.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
-F:     arch/arm/mach-s5pv210/mach-aquila.c
-F:     arch/arm/mach-s5pv210/mach-goni.c
+F:     arch/arm/mach-s5pv210/
 
 ARM/SAMSUNG S5P SERIES 2D GRAPHICS ACCELERATION (G2D) SUPPORT
 M:     Kyungmin Park <kyungmin.park@samsung.com>
@@ -1739,6 +1738,12 @@ M:       Nicolas Ferre <nicolas.ferre@atmel.com>
 S:     Supported
 F:     drivers/net/ethernet/cadence/
 
+ATMEL NAND DRIVER
+M:     Josh Wu <josh.wu@atmel.com>
+L:     linux-mtd@lists.infradead.org
+S:     Supported
+F:     drivers/mtd/nand/atmel_nand*
+
 ATMEL SPI DRIVER
 M:     Nicolas Ferre <nicolas.ferre@atmel.com>
 S:     Supported
@@ -3049,7 +3054,7 @@ M:        Sumit Semwal <sumit.semwal@linaro.org>
 S:     Maintained
 L:     linux-media@vger.kernel.org
 L:     dri-devel@lists.freedesktop.org
-L:     linaro-mm-sig@lists.linaro.org
+L:     linaro-mm-sig@lists.linaro.org (moderated for non-subscribers)
 F:     drivers/dma-buf/
 F:     include/linux/dma-buf*
 F:     include/linux/reservation.h
@@ -3080,14 +3085,13 @@ S:      Supported
 F:     drivers/acpi/dock.c
 
 DOCUMENTATION
-M:     Jiri Kosina <jkosina@suse.cz>
+M:     Jonathan Corbet <corbet@lwn.net>
 L:     linux-doc@vger.kernel.org
 S:     Maintained
 F:     Documentation/
 X:     Documentation/ABI/
 X:     Documentation/devicetree/
 X:     Documentation/[a-z][a-z]_[A-Z][A-Z]/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/doc.git
 
 DOUBLETALK DRIVER
 M:     "James R. Van Zandt" <jrv@vanzandt.mv.com>
@@ -3159,7 +3163,7 @@ F:        include/drm/drm_panel.h
 F:     Documentation/devicetree/bindings/panel/
 
 INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
-M:     Daniel Vetter <daniel.vetter@ffwll.ch>
+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
@@ -4298,9 +4302,8 @@ S:        Maintained
 F:     drivers/media/dvb-frontends/hd29l2*
 
 HEWLETT-PACKARD SMART2 RAID DRIVER
-M:     Chirag Kantharia <chirag.kantharia@hp.com>
 L:     iss_storagedev@hp.com
-S:     Maintained
+S:     Orphan
 F:     Documentation/blockdev/cpqarray.txt
 F:     drivers/block/cpqarray.*
 
@@ -5109,6 +5112,7 @@ F:        include/scsi/*iscsi*
 
 ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR
 M:     Or Gerlitz <ogerlitz@mellanox.com>
+M:     Sagi Grimberg <sagig@mellanox.com>
 M:     Roi Dayan <roid@mellanox.com>
 L:     linux-rdma@vger.kernel.org
 S:     Supported
@@ -5301,6 +5305,13 @@ F:       include/linux/lockd/
 F:     include/linux/sunrpc/
 F:     include/uapi/linux/sunrpc/
 
+KERNEL SELFTEST FRAMEWORK
+M:     Shuah Khan <shuahkh@osg.samsung.com>
+L:     linux-api@vger.kernel.org
+T:     git git://git.kernel.org/pub/scm/shuah/linux-kselftest
+S:     Maintained
+F:     tools/testing/selftests
+
 KERNEL VIRTUAL MACHINE (KVM)
 M:     Gleb Natapov <gleb@kernel.org>
 M:     Paolo Bonzini <pbonzini@redhat.com>
@@ -5747,11 +5758,8 @@ T:       git git://github.com/linux-test-project/ltp.git
 S:     Maintained
 
 M32R ARCHITECTURE
-M:     Hirokazu Takata <takata@linux-m32r.org>
-L:     linux-m32r@ml.linux-m32r.org (moderated for non-subscribers)
-L:     linux-m32r-ja@ml.linux-m32r.org (in Japanese)
 W:     http://www.linux-m32r.org/
-S:     Maintained
+S:     Orphan
 F:     arch/m32r/
 
 M68K ARCHITECTURE
@@ -5985,6 +5993,7 @@ L:        linux-mtd@lists.infradead.org
 W:     http://www.linux-mtd.infradead.org/
 Q:     http://patchwork.ozlabs.org/project/linux-mtd/list/
 T:     git git://git.infradead.org/linux-mtd.git
+T:     git git://git.infradead.org/l2-mtd.git
 S:     Maintained
 F:     drivers/mtd/
 F:     include/linux/mtd/
@@ -6002,6 +6011,15 @@ S:       Supported
 F:     drivers/mcb/
 F:     include/linux/mcb.h
 
+MEN F21BMC (Board Management Controller)
+M:     Andreas Werner <andreas.werner@men.de>
+S:     Supported
+F:     drivers/mfd/menf21bmc.c
+F:     drivers/watchdog/menf21bmc_wdt.c
+F:     drivers/leds/leds-menf21bmc.c
+F:     drivers/hwmon/menf21bmc_hwmon.c
+F:     Documentation/hwmon/menf21bmc
+
 METAG ARCHITECTURE
 M:     James Hogan <james.hogan@imgtec.com>
 L:     linux-metag@vger.kernel.org
@@ -7975,7 +7993,6 @@ S:        Supported
 F:     drivers/mfd/sec*.c
 F:     drivers/regulator/s2m*.c
 F:     drivers/regulator/s5m*.c
-F:     drivers/rtc/rtc-sec.c
 F:     include/linux/mfd/samsung/
 
 SAMSUNG S5P/EXYNOS4 SOC SERIES CAMERA SUBSYSTEM DRIVERS
@@ -8046,7 +8063,7 @@ SYNOPSYS DESIGNWARE DMAC DRIVER
 M:     Viresh Kumar <viresh.linux@gmail.com>
 M:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 S:     Maintained
-F:     include/linux/dw_dmac.h
+F:     include/linux/platform_data/dma-dw.h
 F:     drivers/dma/dw/
 
 SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER