| commit | ca7beb1fa776412ff80708ae98a8467fe4c52737 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Oct 09 07:44:04 2015 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Fri Oct 09 07:44:04 2015 -0700 |
| tree | 67b452d500a73d02d824387f19907660b2705f13 | |
| parent | 85121d6ee6973f98789bf7343f7f636c01e2de19 [diff] | |
| parent | d5a52095afddee121b97c4aac250f18d06803b58 [diff] |
Merge branch 'mlx' Or Gerlitz says: ==================== Mellanox driver update to 4.3-rc4 Small set of fixes for net, which includes Carol's patches, a fix from Achiad to have the right behaviour for mlx5 Eth devices w.r.t VLANs in promiscuous mode, a good-bye patch from Ido who left Mellanox and the 1st patch from Jiri to our NIC drivers (I love one-liners)... ==================== Signed-off-by: David S. Miller <davem@davemloft.net>