Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
commit4dcf39c6cc5f9f01c46aa71fe95cae9927edeeab
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 30 Jul 2007 23:36:33 +0000 (30 16:36 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 30 Jul 2007 23:36:33 +0000 (30 16:36 -0700)
tree84de77738748fdfa54778833b440f7bf009639eb
parentaf9473118979f3b09ee5d92fdbd8014cf085f7c5
parent78d1e02fac0595a8aa8a5064d1bd0c0ea55b22b0
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/ipath: Workaround problem of errormask register being overwritten
  IB/ipath: Fix some issues with buffer cancel and sendctrl register update
  IB/ipath: Use faster put_tid_2 routine after initialization
  IB/ipath: Remove unsafe fastrcvint code from interrupt handler
  IB/ehca: Move extern declarations from .c files to .h files
  IB/mlx4: Whitespace fix
  IB/ehca: Fix include order to better match kernel style
  mlx4_core: Remove kfree() in mlx4_mr_alloc() error flow
  RDMA/amso1100: Initialize the wait_queue_head_t in the c2_qp structure