tree c94ff327a6291672e1f9071a79bf61d63f5f0cb9
parent 852fef69c0d9510a28a70221cfddd004efa02552
parent cc9969c96765476db5e30c9e074a57838604c1d1
author Linus Torvalds <torvalds@linux-foundation.org> 1217130036 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1217130036 -0700

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:
  mlx4: Update/add Mellanox Technologies copyright lines to mlx4 driver files
  mlx4_core: Add VLAN tag field to WQE control segment struct
  RDMA/nes: CM connection setup/teardown rework
  IPoIB: Correct help text for INFINIBAND_IPOIB_DEBUG
  IPoIB/cm: Connected mode is no longer EXPERIMENTAL
  RDMA/ucm: BKL is not needed for ib_ucm_open()
  RDMA/ucma: BKL is not needed for ucma_open()