---

yaml --- r: 256659 b: refs/heads/master c: 52a09a0 h: refs/heads/master i: 256657: c937dca 256655: e6de306 v: v3
git-mirror · Jul 13, 2011 · d28198c · d28198c
1 parent ce7fdc4
commit d28198c
Show file tree

Hide file tree

Showing 15 changed files with 622 additions and 348 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b89925c0d8f7d1cc203682df4fab847a7b4b7ec
+refs/heads/master: 52a09a040dc258ca9eb4fa6530e52ccdbc72e353
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -3425,10 +3425,9 @@ S:	Maintained
 F:	drivers/net/ipg.*
 
 IPATH DRIVER
-M:	Ralph Campbell <infinipath@qlogic.com>
+M:	Mike Marciniszyn <infinipath@qlogic.com>
 L:	linux-rdma@vger.kernel.org
-T:	git git://git.qlogic.com/ipath-linux-2.6
-S:	Supported
+S:	Maintained
 F:	drivers/infiniband/hw/ipath/
 
 IPMI SUBSYSTEM
@@ -5152,6 +5151,12 @@ M:	Robert Jarzmik <robert.jarzmik@free.fr>
 L:	rtc-linux@googlegroups.com
 S:	Maintained
 
+QIB DRIVER
+M:	Mike Marciniszyn <infinipath@qlogic.com>
+L:	linux-rdma@vger.kernel.org
+S:	Supported
+F:	drivers/infiniband/hw/qib/
+
 QLOGIC QLA1280 SCSI DRIVER
 M:	Michael Reed <mdr@sgi.com>
 L:	linux-scsi@vger.kernel.org