Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
commitc2448278e3be3a43fe0343e138444742af1e99ae
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 May 2008 18:11:44 +0000 (23 11:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 May 2008 18:11:44 +0000 (23 11:11 -0700)
treef48201f00ebfb03e13c26e92514e9f2d118923e9
parente6b027a398bcfbb8897353a88a2edfcc97fd604d
parent5a4f2b675210718aceb4abf41617a3af31bba718
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/mad: Fix kernel crash when .process_mad() returns SUCCESS|CONSUMED
  IPoIB: Test for NULL broadcast object in ipiob_mcast_join_finish()
  MAINTAINERS: Add cxgb3 and iw_cxgb3 NIC and iWARP driver entries
  IB/mlx4: Fix creation of kernel QP with max number of send s/g entries
  IB/mthca: Fix max_sge value returned by query_device
  RDMA/cxgb3: Fix uninitialized variable warning in iwch_post_send()
  IB/mlx4: Fix uninitialized-var warning in mlx4_ib_post_send()
  IB/ipath: Fix UC receive completion opcode for RDMA WRITE with immediate
  IB/ipath: Fix printk format for ipath_sdma_status
MAINTAINERS