Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
commitf0e2dcffae8701f00b34bce90e762eb798dea5b1
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 8 Feb 2008 23:34:26 +0000 (8 15:34 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 8 Feb 2008 23:34:26 +0000 (8 15:34 -0800)
treef648533a633a2d065b3c9c569c4e9e3c6b2c2ea8
parent04a94babd68952a4e3cdd54ebf8ce8891f9b0f2e
parent5128bdc97a1018aacac2550cf73bda61041cc3b8
Merge branch 'for-linus' of git://git./linux/kernel/git/roland/infiniband

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/core: Remove unused struct ib_device.flags member
  IB/core: Add IP checksum offload support
  IPoIB: Add send gather support
  IPoIB: Add high DMA feature flag
  IB/mlx4: Use multiple WQ blocks to post smaller send WQEs
  mlx4_core: Clean up struct mlx4_buf
  mlx4_core: For 64-bit systems, vmap() kernel queue buffers
  IB/mlx4: Consolidate code to get an entry from a struct mlx4_buf