diff options
author | Roland Dreier <rolandd@cisco.com> | 2010-07-08 18:10:24 +0200 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2010-07-08 18:10:24 +0200 |
commit | 9e770044a0f08a6dcf245152ec1575f7cb0b9631 (patch) | |
tree | 37e1f1e68b5224875f11719c6470160a413ba79f | |
parent | RDMA/cxgb4: Derive smac_idx from port viid (diff) | |
parent | IPoIB: Fix world-writable child interface control sysfs attributes (diff) | |
parent | IB/qib: Clean up properly if qib_init() fails (diff) | |
download | linux-9e770044a0f08a6dcf245152ec1575f7cb0b9631.tar.xz linux-9e770044a0f08a6dcf245152ec1575f7cb0b9631.zip |
Merge branches 'cxgb4', 'ipoib' and 'qib' into for-next