selinux/nlmsg: add XFRM_MSG_[NEW|GET]SADINFO

[deliverable/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index efbcb50e496954934295b3147e1de9dbdd05ff9e..9091b4ad1cc3c74c380da5e1eff26c14f8e165d1 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6322,6 +6322,7 @@ F:        drivers/scsi/megaraid/
 
 MELLANOX ETHERNET DRIVER (mlx4_en)
 M:     Amir Vadai <amirv@mellanox.com>
+M:     Ido Shamay <idos@mellanox.com>
 L:     netdev@vger.kernel.org
 S:     Supported
 W:     http://www.mellanox.com
@@ -8351,7 +8352,6 @@ F:        block/partitions/ibm.c
 
 S390 NETWORK DRIVERS
 M:     Ursula Braun <ursula.braun@de.ibm.com>
-M:     Frank Blaschka <blaschka@linux.vnet.ibm.com>
 M:     linux390@de.ibm.com
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
@@ -9826,7 +9826,7 @@ F:        include/linux/wl12xx.h
 
 TIPC NETWORK LAYER
 M:     Jon Maloy <jon.maloy@ericsson.com>
-M:     Allan Stephens <allan.stephens@windriver.com>
+M:     Ying Xue <ying.xue@windriver.com>
 L:     netdev@vger.kernel.org (core kernel code)
 L:     tipc-discussion@lists.sourceforge.net (user apps, general discussion)
 W:     http://tipc.sourceforge.net/