tree 3e1720bf504ad6dcca7d4b1166ed4bce2e76c6d1
parent 0a51f76e3c3efcd5eb740868e1096221f8d7d8e0
parent 99611ba127cfa13ddaed51f9d3cd1765a8214dd4
author David S. Miller <davem@davemloft.net> 1435131768 -0700
committer David S. Miller <davem@davemloft.net> 1435131768 -0700

Merge branch 'mlx-next'

Or Gerlitz says:

====================
Mellanox NIC drivers update, June 23 2015

This series has two fixes from Eran to his recent SRIOV counters work in
mlx4 and few more updates from Saeed and Achiad to the mlx5 Ethernet
code. All fixes here relate to net-next code, so no need for -stable.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>