summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2012-12-20 08:03:43 +0100
committerRoland Dreier <roland@purestorage.com>2012-12-20 08:03:43 +0100
commitd72623b665d84b1e07fe43854e83387fce8dd134 (patch)
treea6ddb792a2af9614ae8af3a93e8445e5ee6f2c33 /drivers/net
parentRDMA/cxgb4: Fix bug for active and passive LE hash collision path (diff)
parentIPoIB: Call skb_dst_drop() once skb is enqueued for sending (diff)
parentmlx4_core: Allow choosing flow steering mode (diff)
downloadlinux-d72623b665d84b1e07fe43854e83387fce8dd134.tar.xz
linux-d72623b665d84b1e07fe43854e83387fce8dd134.zip
Merge branches 'cxgb4', 'ipoib' and 'mlx4' into for-next