tree 93bf76c9038844f3ac4eda0ce650915e5e06e3b6
parent 0996076973856e093c84ed870501fb9d5c72f8a3
parent 70632d0afe749c44562c1112eea0839774bcf578
author David S. Miller <davem@davemloft.net> 1366835640 -0400
committer David S. Miller <davem@davemloft.net> 1366835649 -0400

Merge branch 'bnx2x'

Yuval Mintz says:

====================
This patch series contains several enhancements, as well as small fixes:

  - Patch [1/5] - Prevent a theoretical problem in our GRO implementation.

  - Patch [2/5] - Support Rx/Tx pause control configuration in autoneg.

  - Patch [3/5] - Enhance support for VF's MAC setting and removal.

  - Patch [4/5] - Fix a small memory leak between bnx2x and cnic.

  - Patch [5/5] - Allow bnx2x to recover after a second slot reset.

Please consider applying these patches to `net-next'.
====================

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