| commit | 16dfd1faed8c5235d9a7c190b91b6d97d6cd3272 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 4 Nov 2011 19:14:11 +0000 (4 12:14 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 4 Nov 2011 19:14:11 +0000 (4 12:14 -0700) | ||
| tree | 4de59077fa4a31cac13e7ba8528e347c0ca1dc2f | treesnapshot (tar.gz zip) |
| parent | b31966816dcd3d8b16109f39d7c7501dc9abb010 | commitdiff |
| parent | b8108d6886946cb50434bdbb0214ed81885da8b8 | commitdiff |
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/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
* '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