tree 1832a7b19b4a403b29b3b066a3b0db88833c7094
parent 9f0d34bc344889c2e6c593bd949d7ab821f0f4a5
parent db60304718583f99162adabb7dd96e2f7073f8f3
author David S. Miller <davem@davemloft.net> 1428006327 -0400
committer David S. Miller <davem@davemloft.net> 1428006327 -0400

Merge branch 'mlx4-next'

Or Gerlitz says:

====================
Mellanox mlx4 driver updates

The main feature added by this series are Ido's changes to support
Granular QoS for VFs, where for the time being only max rate is supported.

Muhammad added support for setting rx-fcs and rx-all through ethtool,
and Ido did the interface identify work.

Last, add Ido as a maintainer for the mlx4 Ethernet driver!

Some of next week is the Passover holiday here and I will be
mostly OOO. If needed (...) Ido or Amir will send V1 and such.

Rebased against net-next commit 033f46b "crypto: algif -
explicitly mark end of data".
====================

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