]> err.no Git - linux-2.6/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Jul 2008 03:40:36 +0000 (20:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Jul 2008 03:40:36 +0000 (20:40 -0700)
commit8be1a6d6c77ab4532e4476fdb8177030ef48b52c
treec94ff327a6291672e1f9071a79bf61d63f5f0cb9
parent852fef69c0d9510a28a70221cfddd004efa02552
parentcc9969c96765476db5e30c9e074a57838604c1d1
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()
drivers/net/mlx4/eq.c