diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-04 12:14:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-04 12:14:11 -0700 |
| commit | 16dfd1faed8c5235d9a7c190b91b6d97d6cd3272 (patch) | |
| tree | 4de59077fa4a31cac13e7ba8528e347c0ca1dc2f /net | |
| parent | b31966816dcd3d8b16109f39d7c7501dc9abb010 (diff) | |
| parent | b8108d6886946cb50434bdbb0214ed81885da8b8 (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/qib: Fix panic in RC error flushing logic
IB/iser: DMA unmap TX bufs used for iSCSI/iSER headers
IB/iser: Use separate buffers for the login request/response
IB/mthca: Fix buddy->num_free allocation size
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions