| commit | dae816835e8d1276c9e50d9c4dba75b7705fe66c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Aug 12 16:38:45 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Aug 12 16:38:45 2008 -0700 |
| tree | 0df2e2aeb3d2ac7ba8deb4352e83cf8d306a91aa | |
| parent | ddc752a4068088bfc5558a3f72e4f7cca3fc1210 [diff] | |
| parent | 3a3eae0d66591572f771b9383e96ecacacee0abd [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/ehca: Discard double CQE for one WR IB/ehca: Check idr_find() return value IB/ehca: Repoll CQ on invalid opcode IB/ehca: Rename goto label in ehca_poll_cq_one() IB/ehca: Update qp_state on cached modify_qp() IPoIB/cm: Use vmalloc() to allocate rx_rings