diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-13 01:38:45 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-13 01:38:45 +0200 |
| commit | dae816835e8d1276c9e50d9c4dba75b7705fe66c (patch) | |
| tree | 0df2e2aeb3d2ac7ba8deb4352e83cf8d306a91aa /fs/lockd | |
| parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/... (diff) | |
| parent | Merge branches 'ehca' and 'ipoib' into for-linus (diff) | |
| download | linux-dae816835e8d1276c9e50d9c4dba75b7705fe66c.tar.xz linux-dae816835e8d1276c9e50d9c4dba75b7705fe66c.zip | |
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
Diffstat (limited to 'fs/lockd')
0 files changed, 0 insertions, 0 deletions