diff options
author | Roland Dreier <roland@purestorage.com> | 2012-06-06 19:08:11 +0200 |
---|---|---|
committer | Roland Dreier <roland@purestorage.com> | 2012-06-06 19:08:11 +0200 |
commit | 20952cdd8e79945245be29f8f5ecac5abc99b4ae (patch) | |
tree | 6203c5a3c47f41ad79979810fc1aab6f74e13b62 /drivers/net | |
parent | RDMA/cxgb4: Fix crash when peer address is 0.0.0.0 (diff) | |
parent | IB/mlx4: Fix max_wqe capacity reported from query device (diff) | |
parent | RDMA/ocrdma: Remove unnecessary version.h includes (diff) | |
download | linux-20952cdd8e79945245be29f8f5ecac5abc99b4ae.tar.xz linux-20952cdd8e79945245be29f8f5ecac5abc99b4ae.zip |
Merge branches 'cxgb4', 'mlx4' and 'ocrdma' into for-linus