From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Apr 2010 18:53:06 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... 
X-Git-Tag: v2.6.34-rc4~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0eddb519b9127c73d53db4bf3ec1d45b13f844d1;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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/mlx4: Check correct variable for allocation failure
  RDMA/nes: Correct cap.max_inline_data assignment in nes_query_qp()
  RDMA/cm: Set num_paths when manually assigning path records
  IB/cm: Fix device_create() return value check
---

0eddb519b9127c73d53db4bf3ec1d45b13f844d1