| commit | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 09 11:53:06 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 09 11:53:06 2010 -0700 |
| tree | 83855363f7be25305477dca09a91166deb376354 | |
| parent | f16393776fc133d95fe3b3ba7118df579ed90af5 [diff] | |
| parent | 5091b353883ba3358998797efb284f82344531f3 [diff] |
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/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