tree dbfda378d0d6ce818b9a44b4cc2dd4fd4fa2f7aa
parent 664a1566df81b44f7e5e234d55e3bc8c6c0be211
parent ead595aeb0974171eddd012df115424752413c26
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1203053012 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1203053012 -0800

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:
  RDMA/cma: Do not issue MRA if user rejects connection request
  mlx4_core: Move table_find from fmr_alloc to fmr_enable
  IB/mlx4: mlx4_ib_fmr_alloc() should call mlx4_fmr_enable()
  IPoIB: Remove unused struct ipoib_cm_tx.ibwc member
  IPoIB: On P_Key change event, reset state properly
  IB/mthca: Convert to use be16_add_cpu()
  RDMA/cxgb3: Fail loopback connections
  IB/cm: Fix infiniband_cm class kobject ref counting
  IB/cm: Remove debug printk()s that snuck upstream
  IB/mthca: Add missing sg_init_table() in mthca_map_user_db()