Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
authorLinus Torvalds <torvalds@woody.osdl.org>
Wed, 10 Jan 2007 03:48:15 +0000 (19:48 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Wed, 10 Jan 2007 03:48:15 +0000 (19:48 -0800)
commitf3a2c3ee458bd614231e548c13acb0cf33a68631
tree9af88e8f7cf9c47f9624203e97cdac2248c646f2
parent656829e2d052b1da4a72aa2ac39ad733a78530ce
parentf5e10529a9a835a267f6aa7806e291d6df845e14
Merge branch 'for-linus' of /linux/kernel/git/roland/infiniband

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  IB/mthca: Don't execute QUERY_QP firmware command for QP in RESET state
  IB/ehca: Use proper GFP_ flags for get_zeroed_page()
  IB/mthca: Fix PRM compliance problem in atomic-send completions
  RDMA/ucma: Don't report events with invalid user context
  RDMA/ucma: Fix struct ucma_event leak when backlog is full
  RDMA/iwcm: iWARP connection timeouts shouldn't be reported as rejects
  IB/iser: Return error code when PDUs may not be sent
  IB/mthca: Fix off-by-one in FMR handling on memfree