diff options
author | Roland Dreier <roland@purestorage.com> | 2011-11-04 17:36:04 +0100 |
---|---|---|
committer | Roland Dreier <roland@purestorage.com> | 2011-11-04 17:36:04 +0100 |
commit | b8108d6886946cb50434bdbb0214ed81885da8b8 (patch) | |
tree | 804ec28a5cc61362b04e130d9d2dec6908758d16 /drivers/infiniband/hw | |
parent | IB/iser: DMA unmap TX bufs used for iSCSI/iSER headers (diff) | |
parent | IB/mthca: Fix buddy->num_free allocation size (diff) | |
parent | IB/qib: Fix panic in RC error flushing logic (diff) | |
download | linux-b8108d6886946cb50434bdbb0214ed81885da8b8.tar.xz linux-b8108d6886946cb50434bdbb0214ed81885da8b8.zip |
Merge branches 'iser', 'mthca' and 'qib' into for-next