pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff

author	Linus Torvalds <torvalds@linux-foundation.org>
	Sun, 27 Jul 2008 03:40:36 +0000 (20:40 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Sun, 27 Jul 2008 03:40:36 +0000 (20:40 -0700)

* '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()

		1	2
drivers/net/mlx4/eq.c	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge