diff options
| author | David S. Miller <davem@davemloft.net> | 2015-11-16 00:43:47 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-11-16 00:43:47 +0100 |
| commit | 8863002c5acd6f89b6cf57df4dff2248e97381e1 (patch) | |
| tree | e169d909b3a377c0e21d48f3eda89ea9021903bb /net/mac80211/key.h | |
| parent | ipvs: use skb_to_full_sk() helper (diff) | |
| parent | net/mlx4_core: Avoid returning success in case of an error flow (diff) | |
| download | linux-8863002c5acd6f89b6cf57df4dff2248e97381e1.tar.xz linux-8863002c5acd6f89b6cf57df4dff2248e97381e1.zip | |
Merge branch 'mellanox-net-fixes'
Or Gerlitz says:
====================
Mellanox NIC driver update, Nov 12, 2015
Few small mlx5 and mlx4 fixes from the team... done over
net commit c5a3788 "Merge branch 'akpm' (patches from Andrew)"
Eran's patch needs to go to 4.2 and 4.3 stable kernels.
Tariq's patch need to go to 4.3 stable too.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/key.h')
0 files changed, 0 insertions, 0 deletions