From: David S. Miller <davem@davemloft.net>
Date: Wed, 24 Apr 2013 20:34:00 +0000 (-0400)
Subject: Merge branch 'bnx2x'
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=01f27fc085574b301248d4da241e9d5ebd61e5c9;p=~shefty%2Frdma-dev.git

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>
---

01f27fc085574b301248d4da241e9d5ebd61e5c9