summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Marciniszyn <mike.marciniszyn@intel.com>2012-05-10 09:25:20 -0400
committerRoland Dreier <roland@purestorage.com>2012-05-14 12:35:26 -0700
commit8473c60314f5a225019a25bcd13763d42d988827 (patch)
tree480397f57f9e92d81a19fc7eeedfcf809be69dcf
parentd48b97b403d23f6df0b990cee652bdf9a52337a3 (diff)
downloadlinux-8473c60314f5a225019a25bcd13763d42d988827.tar.bz2
MAINTAINERS: Update qib and ipath entries from QLogic to Intel
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com> Signed-off-by: Roland Dreier <roland@purestorage.com>
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 707163365a93..5e8a9328e3f1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3631,7 +3631,7 @@ S: Maintained
F: drivers/net/ethernet/icplus/ipg.*
IPATH DRIVER
-M: Mike Marciniszyn <infinipath@qlogic.com>
+M: Mike Marciniszyn <infinipath@intel.com>
L: linux-rdma@vger.kernel.org
S: Maintained
F: drivers/infiniband/hw/ipath/
@@ -5455,7 +5455,7 @@ L: rtc-linux@googlegroups.com
S: Maintained
QIB DRIVER
-M: Mike Marciniszyn <infinipath@qlogic.com>
+M: Mike Marciniszyn <infinipath@intel.com>
L: linux-rdma@vger.kernel.org
S: Supported
F: drivers/infiniband/hw/qib/