diff options
author | Roland Dreier <roland@purestorage.com> | 2013-02-05 18:45:25 +0100 |
---|---|---|
committer | Roland Dreier <roland@purestorage.com> | 2013-02-05 18:45:25 +0100 |
commit | cbdba97a0f576cc2d958048ffedbe88948b67e03 (patch) | |
tree | 94fd2285cbfd2d433b88955db21bf8f2aabd661a | |
parent | IPoIB: Fix crash due to skb double destruct (diff) | |
parent | mlx4_core: Fix advertisement of wrong PF context behaviour (diff) | |
parent | IB/qib: Fix for broken sparse warning fix (diff) | |
download | linux-cbdba97a0f576cc2d958048ffedbe88948b67e03.tar.xz linux-cbdba97a0f576cc2d958048ffedbe88948b67e03.zip |
Merge branches 'ipoib', 'mlx4' and 'qib' into for-next