diff options
| author | David S. Miller <davem@davemloft.net> | 2013-04-24 16:34:00 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-24 16:34:09 -0400 |
| commit | 01f27fc085574b301248d4da241e9d5ebd61e5c9 (patch) | |
| tree | 93bf76c9038844f3ac4eda0ce650915e5e06e3b6 /drivers/block/cpqarray.c | |
| parent | 0996076973856e093c84ed870501fb9d5c72f8a3 (diff) | |
| parent | 70632d0afe749c44562c1112eea0839774bcf578 (diff) | |
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>
Diffstat (limited to 'drivers/block/cpqarray.c')
0 files changed, 0 insertions, 0 deletions