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
  ...

1 files changed, 8 insertions, 3 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 81cf5fb615e5..41ec646d8a98 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3426,10 +3426,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