driver: net: xgene: Add support for 2nd 10GbE port

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index d8a0aad20d6f0febeea1f71efff2542377c646cf..310da4295c7026e27698e9f8b980adcc1893b774 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5341,6 +5341,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git
 S:     Supported
 F:     Documentation/infiniband/
 F:     drivers/infiniband/
+F:     drivers/staging/rdma/
 F:     include/uapi/linux/if_infiniband.h
 F:     include/uapi/rdma/
 F:     include/rdma/
@@ -5598,7 +5599,7 @@ IPATH DRIVER
 M:     Mike Marciniszyn <infinipath@intel.com>
 L:     linux-rdma@vger.kernel.org
 S:     Maintained
-F:     drivers/infiniband/hw/ipath/
+F:     drivers/staging/rdma/ipath/
 
 IPMI SUBSYSTEM
 M:     Corey Minyard <minyard@acm.org>
@@ -7376,7 +7377,7 @@ F:        drivers/scsi/nsp32*
 NIOS2 ARCHITECTURE
 M:     Ley Foon Tan <lftan@altera.com>
 L:     nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
-T:     git git://git.rocketboards.org/linux-socfpga-next.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git
 S:     Maintained
 F:     arch/nios2/
 
@@ -8198,10 +8199,9 @@ F:       drivers/hwmon/pmbus/
 F:     include/linux/i2c/pmbus.h
 
 PMC SIERRA MaxRAID DRIVER
-M:     Anil Ravindranath <anil_ravindranath@pmc-sierra.com>
 L:     linux-scsi@vger.kernel.org
 W:     http://www.pmc-sierra.com/
-S:     Supported
+S:     Orphan
 F:     drivers/scsi/pmcraid.*
 
 PMC SIERRA PM8001 DRIVER
@@ -9976,6 +9976,12 @@ M:       Arnaud Patard <arnaud.patard@rtp-net.org>
 S:     Odd Fixes
 F:     drivers/staging/xgifb/
 
+HFI1 DRIVER
+M:     Mike Marciniszyn <infinipath@intel.com>
+L:     linux-rdma@vger.kernel.org
+S:     Supported
+F:     drivers/staging/rdma/hfi1
+
 STARFIRE/DURALAN NETWORK DRIVER
 M:     Ion Badulescu <ionut@badula.org>
 S:     Odd Fixes