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: (76 commits)
  IB: Update MAINTAINERS with Hal's new email address
  IB/mlx4: Implement query SRQ
  IB/mlx4: Implement query QP
  IB/cm: Send no match if a SIDR REQ does not match a listen
  IB/cm: Fix handling of duplicate SIDR REQs
  IB/cm: cm_msgs.h should include ib_cm.h
  IB/cm: Include HCA ACK delay in local ACK timeout
  IB/cm: Use spin_lock_irq() instead of spin_lock_irqsave() when possible
  IB/sa: Make sure SA queries use default P_Key
  IPoIB: Recycle loopback skbs instead of freeing and reallocating
  IB/mthca: Replace memset(<addr>, 0, PAGE_SIZE) with clear_page(<addr>)
  IPoIB/cm: Fix warning if IPV6 is not enabled
  IB/core: Take sizeof the correct pointer when calling kmalloc()
  IB/ehca: Improve latency by unlocking after triggering the hardware
  IB/ehca: Notify consumers of LID/PKEY/SM changes after nondisruptive events
  IB/ehca: Return QP pointer in poll_cq()
  IB/ehca: Change idr spinlocks into rwlocks
  IB/ehca: Refactor sync between completions and destroy_cq using atomic_t
  IB/ehca: Lock renaming, static initializers
  IB/ehca: Report RDMA atomic attributes in query_qp()
  ...

1 files changed, 8 insertions, 7 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 228a45b8dc62..05a1f1a024ac 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -370,7 +370,7 @@ P:	Tom Tucker
 M:      tom@opengridcomputing.com
 P:      Steve Wise
 M:      swise@opengridcomputing.com
-L:      openib-general@openib.org
+L:      general@lists.openfabrics.org
 S:      Maintained
 
 AOA (Apple Onboard Audio) ALSA DRIVER
@@ -1395,7 +1395,7 @@ P:	Hoang-Nam Nguyen
 M:      hnguyen@de.ibm.com
 P:      Christoph Raisch
 M:      raisch@de.ibm.com
-L:      openib-general@openib.org
+L:      general@lists.openfabrics.org
 S:      Supported
 
 EMU10K1 SOUND DRIVER
@@ -1849,8 +1849,8 @@ M:	rolandd@cisco.com
 P:      Sean Hefty
 M:      mshefty@ichips.intel.com
 P:      Hal Rosenstock
-M:      halr@voltaire.com
-L:      openib-general@openib.org
+M:      hal.rosenstock@gmail.com 
+L:      general@lists.openfabrics.org
 W:      http://www.openib.org/
 T:      git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git
 S:      Supported
@@ -1988,9 +1988,10 @@ M:	jjciarla@raiz.uncu.edu.ar
 S:      Maintained
 
 IPATH DRIVER:
-P:      Bryan O'Sullivan
-M:      support@pathscale.com
-L:      openib-general@openib.org
+P:      Arthur Jones
+M:      infinipath@qlogic.com
+L:      general@lists.openfabrics.org
+T:      git git://git.qlogic.com/ipath-linux-2.6
 S:      Supported
 
 IPMI SUBSYSTEM