tree 6307966acabb65f332213cb886fddd4f0821c164
parent b65d04a7859f4cfea1a40de260cb52d8f7897aff
parent e5a010690141ab805b059ba10f7401b80e0be831
author Linus Torvalds <torvalds@g5.osdl.org> 1159828151 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1159828151 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/ehca: Tweak trace message format
  IB/ehca: Fix device registration
  IB/ipath: Fix RDMA reads
  RDMA/cma: Optimize error handling
  RDMA/cma: Eliminate unnecessary remove_list
  RDMA/cma: Set status correctly on route resolution error
  RDMA/cma: Fix device removal race
  RDMA/cma: Fix leak of cm_ids in case of failures