diff options
| author | Roland Dreier <roland@purestorage.com> | 2012-07-30 07:47:27 -0700 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2012-07-30 07:47:27 -0700 |
| commit | 1da9b6b43e31a5d88a82cc70b8f57090c9dd2be8 (patch) | |
| tree | 87507a57458c7f8ab4a6fe3ae703420c70a997f9 /drivers/infiniband | |
| parent | 0764c76ecb06987749bce49657e473e6605f09c4 (diff) | |
| parent | b63b70d8774175b6f8393c495fe455f0fba55ce1 (diff) | |
| parent | 9e8fa040cb2d9070d15d3f0d71b83e85e32ecde2 (diff) | |
| parent | 5d7fe4efbf0878e0ef12c8f93e7a16c750494b7e (diff) | |
Merge branches 'cma', 'ipoib', 'ocrdma' and 'qib' into for-next