Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[cascardo/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index fe57950..7316ab6 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -894,6 +894,14 @@ ARM/MAGICIAN MACHINE SUPPORT
 M:     Philipp Zabel <philipp.zabel@gmail.com>
 S:     Maintained
 
+ARM/Marvell Armada 370 and Armada XP SOC support
+M:     Jason Cooper <jason@lakedaemon.net>
+M:     Andrew Lunn <andrew@lunn.ch>
+M:     Gregory Clement <gregory.clement@free-electrons.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+F:     arch/arm/mach-mvebu/
+
 ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support
 M:     Jason Cooper <jason@lakedaemon.net>
 M:     Andrew Lunn <andrew@lunn.ch>
@@ -1103,6 +1111,16 @@ S:       Supported
 F:     arch/arm/mach-shmobile/
 F:     drivers/sh/
 
+ARM/SOCFPGA ARCHITECTURE
+M:     Dinh Nguyen <dinguyen@altera.com>
+S:     Maintained
+F:     arch/arm/mach-socfpga/
+
+ARM/SOCFPGA CLOCK FRAMEWORK SUPPORT
+M:     Dinh Nguyen <dinguyen@altera.com>
+S:     Maintained
+F:     drivers/clk/socfpga/
+
 ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
 M:     Lennert Buytenhek <kernel@wantstofly.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -6202,6 +6220,15 @@ T:       git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 F:     include/linux/srcu*
 F:     kernel/srcu*
 
+SMACK SECURITY MODULE
+M:     Casey Schaufler <casey@schaufler-ca.com>
+L:     linux-security-module@vger.kernel.org
+W:     http://schaufler-ca.com
+T:     git git://git.gitorious.org/smack-next/kernel.git
+S:     Maintained
+F:     Documentation/security/Smack.txt
+F:     security/smack/
+
 SMC91x ETHERNET DRIVER
 M:     Nicolas Pitre <nico@fluxnic.net>
 S:     Odd Fixes
@@ -6834,10 +6861,11 @@ F:      include/linux/shmem_fs.h
 F:     mm/shmem.c
 
 TPM DEVICE DRIVER
-M:     Debora Velarde <debora@linux.vnet.ibm.com>
-M:     Rajiv Andrade <srajiv@linux.vnet.ibm.com>
+M:     Kent Yoder <key@linux.vnet.ibm.com>
+M:     Rajiv Andrade <mail@srajiv.net>
 W:     http://tpmdd.sourceforge.net
-M:     Marcel Selhorst <m.selhorst@sirrix.com>
+M:     Marcel Selhorst <tpmdd@selhorst.net>
+M:     Sirrix AG <tpmdd@sirrix.com>
 W:     http://www.sirrix.com
 L:     tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
 S:     Maintained