Merge tag 'nfs-for-3.20-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 8726ac5d7cec669b3d43bfa4b3c68604454655ac..37c10098a6278fcbd2c30c13b662696e8497f466 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -563,6 +563,12 @@ S: Odd Fixes
 L:     linux-alpha@vger.kernel.org
 F:     arch/alpha/
 
+ALTERA MAILBOX DRIVER
+M:     Ley Foon Tan <lftan@altera.com>
+L:     nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
+S:     Maintained
+F:     drivers/mailbox/mailbox-altera.c
+
 ALTERA TRIPLE SPEED ETHERNET DRIVER
 M:     Vince Bridgers <vbridger@opensource.altera.com>
 L:     netdev@vger.kernel.org
@@ -3220,6 +3226,7 @@ F:        Documentation/
 X:     Documentation/ABI/
 X:     Documentation/devicetree/
 X:     Documentation/[a-z][a-z]_[A-Z][A-Z]/
+T:     git git://git.lwn.net/linux-2.6.git docs-next
 
 DOUBLETALK DRIVER
 M:     "James R. Van Zandt" <jrv@vanzandt.mv.com>
@@ -3479,6 +3486,14 @@ M:       "Maciej W. Rozycki" <macro@linux-mips.org>
 S:     Maintained
 F:     drivers/tty/serial/dz.*
 
+E3X0 POWER BUTTON DRIVER
+M:     Moritz Fischer <moritz.fischer@ettus.com>
+L:     usrp-users@lists.ettus.com
+W:     http://www.ettus.com
+S:     Supported
+F:     drivers/input/misc/e3x0-button.c
+F:     Documentation/devicetree/bindings/input/e3x0-button.txt
+
 E4000 MEDIA DRIVER
 M:     Antti Palosaari <crope@iki.fi>
 L:     linux-media@vger.kernel.org
@@ -6762,6 +6777,7 @@ F:        Documentation/devicetree/bindings/net/nfc/
 
 NFS, SUNRPC, AND LOCKD CLIENTS
 M:     Trond Myklebust <trond.myklebust@primarydata.com>
+M:     Anna Schumaker <anna.schumaker@netapp.com>
 L:     linux-nfs@vger.kernel.org
 W:     http://client.linux-nfs.org
 T:     git git://git.linux-nfs.org/projects/trondmy/linux-nfs.git
@@ -9281,6 +9297,13 @@ F:       arch/m68k/sun3*/
 F:     arch/m68k/include/asm/sun3*
 F:     drivers/net/ethernet/i825xx/sun3*
 
+SUN4I LOW RES ADC ATTACHED TABLET KEYS DRIVER
+M:     Hans de Goede <hdegoede@redhat.com>
+L:     linux-input@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt
+F:     drivers/input/keyboard/sun4i-lradc-keys.c
+
 SUNDANCE NETWORK DRIVER
 M:     Denis Kirjanov <kda@linux-powerpc.org>
 L:     netdev@vger.kernel.org
@@ -10713,6 +10736,7 @@ M:      Max Filippov <jcmvbkbc@gmail.com>
 L:     linux-xtensa@linux-xtensa.org
 S:     Maintained
 F:     drivers/spi/spi-xtensa-xtfpga.c
+F:     sound/soc/xtensa/xtfpga-i2s.c
 
 YAM DRIVER FOR AX.25
 M:     Jean-Paul Roubelat <jpr@f6fbb.org>