From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 2 Oct 2006 22:29:11 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... 
X-Git-Tag: Ubuntu-5.0.0-8.9~46041
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=829d464e60151a525c7ba57e7acfc4fc297f7069;p=mirror_ubuntu-disco-kernel.git

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
---

829d464e60151a525c7ba57e7acfc4fc297f7069