aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-22 17:50:12 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-22 17:50:12 -0400
commitece236ce2fad9c27a6fd2530f899289025194bce (patch)
tree474b793205872206a2a3f7d409ff9b1f81f3a9a8 /MAINTAINERS
parent441c196e84b11aad3123baa9320eee7abc6b5c98 (diff)
parent4460207561290c3be7e6c7538f22690028170c1d (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (26 commits) IB/qib: Defer HCA error events to tasklet mlx4_core: Bump the driver version to 1.0 RDMA/cxgb4: Use printk_ratelimited() instead of printk_ratelimit() IB/mlx4: Support PMA counters for IBoE IB/mlx4: Use flow counters on IBoE ports IB/pma: Add include file for IBA performance counters definitions mlx4_core: Add network flow counters mlx4_core: Fix location of counter index in QP context struct mlx4_core: Read extended capabilities into the flags field mlx4_core: Extend capability flags to 64 bits IB/mlx4: Generate GID change events in IBoE code IB/core: Add GID change event RDMA/cma: Don't allow IPoIB port space for IBoE RDMA: Allow for NULL .modify_device() and .modify_port() methods IB/qib: Update active link width IB/qib: Fix potential deadlock with link down interrupt IB/qib: Add sysfs interface to read free contexts IB/mthca: Remove unnecessary read of PCI_CAP_ID_EXP IB/qib: Remove double define IB/qib: Remove unnecessary read of PCI_CAP_ID_EXP ...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS11
1 files changed, 8 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 81cf5fb615e..41ec646d8a9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3426,10 +3426,9 @@ S: Maintained
3426F: drivers/net/ipg.* 3426F: drivers/net/ipg.*
3427 3427
3428IPATH DRIVER 3428IPATH DRIVER
3429M: Ralph Campbell <infinipath@qlogic.com> 3429M: Mike Marciniszyn <infinipath@qlogic.com>
3430L: linux-rdma@vger.kernel.org 3430L: linux-rdma@vger.kernel.org
3431T: git git://git.qlogic.com/ipath-linux-2.6 3431S: Maintained
3432S: Supported
3433F: drivers/infiniband/hw/ipath/ 3432F: drivers/infiniband/hw/ipath/
3434 3433
3435IPMI SUBSYSTEM 3434IPMI SUBSYSTEM
@@ -5152,6 +5151,12 @@ M: Robert Jarzmik <robert.jarzmik@free.fr>
5152L: rtc-linux@googlegroups.com 5151L: rtc-linux@googlegroups.com
5153S: Maintained 5152S: Maintained
5154 5153
5154QIB DRIVER
5155M: Mike Marciniszyn <infinipath@qlogic.com>
5156L: linux-rdma@vger.kernel.org
5157S: Supported
5158F: drivers/infiniband/hw/qib/
5159
5155QLOGIC QLA1280 SCSI DRIVER 5160QLOGIC QLA1280 SCSI DRIVER
5156M: Michael Reed <mdr@sgi.com> 5161M: Michael Reed <mdr@sgi.com>
5157L: linux-scsi@vger.kernel.org 5162L: linux-scsi@vger.kernel.org