Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[linux-2.6-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index a7901e1df0584166f9d777e5e84a418a614a239b..350bb27a1c25f77c713987a3c464757281dfc719 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11018,14 +11018,6 @@ F:     driver/net/net_failover.c
 F:     include/net/net_failover.h
 F:     Documentation/networking/net_failover.rst
 
-NETEFFECT IWARP RNIC DRIVER (IW_NES)
-M:     Faisal Latif <faisal.latif@intel.com>
-L:     linux-rdma@vger.kernel.org
-W:     http://www.intel.com/Products/Server/Adapters/Server-Cluster/Server-Cluster-overview.htm
-S:     Supported
-F:     drivers/infiniband/hw/nes/
-F:     include/uapi/rdma/nes-abi.h
-
 NETEM NETWORK EMULATOR
 M:     Stephen Hemminger <stephen@networkplumber.org>
 L:     netem@lists.linux-foundation.org (moderated for non-subscribers)
@@ -14755,6 +14747,13 @@ M:     Chris Boot <bootc@bootc.net>
 S:     Maintained
 F:     drivers/leds/leds-net48xx.c
 
+SOFT-IWARP DRIVER (siw)
+M:     Bernard Metzler <bmt@zurich.ibm.com>
+L:     linux-rdma@vger.kernel.org
+S:     Supported
+F:     drivers/infiniband/sw/siw/
+F:     include/uapi/rdma/siw-abi.h
+
 SOFT-ROCE DRIVER (rxe)
 M:     Moni Shoua <monis@mellanox.com>
 L:     linux-rdma@vger.kernel.org