diff options
author | Roland Dreier <roland@purestorage.com> | 2012-12-20 08:03:43 +0100 |
---|---|---|
committer | Roland Dreier <roland@purestorage.com> | 2012-12-20 08:03:43 +0100 |
commit | d72623b665d84b1e07fe43854e83387fce8dd134 (patch) | |
tree | a6ddb792a2af9614ae8af3a93e8445e5ee6f2c33 /drivers/net | |
parent | RDMA/cxgb4: Fix bug for active and passive LE hash collision path (diff) | |
parent | IPoIB: Call skb_dst_drop() once skb is enqueued for sending (diff) | |
parent | mlx4_core: Allow choosing flow steering mode (diff) | |
download | linux-d72623b665d84b1e07fe43854e83387fce8dd134.tar.xz linux-d72623b665d84b1e07fe43854e83387fce8dd134.zip |
Merge branches 'cxgb4', 'ipoib' and 'mlx4' into for-next