diff options
| author | David S. Miller <davem@davemloft.net> | 2014-02-13 00:16:03 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-02-13 00:16:03 (GMT) |
| commit | 7282ec8cb4f82287c2aef20a24328b42c630f7cb (patch) | |
| tree | fb9d2e49c12469cd021f5f2db0139ba701cae11c /include/net/tc_act/tc_nat.h | |
| parent | 8bed1285b98e6a90403cdfe0500e8ad6bd8e8f1c (diff) | |
| parent | 3156b8eb9d85ee475de20352c07cb386a53255c2 (diff) | |
| download | linux-7282ec8cb4f82287c2aef20a24328b42c630f7cb.tar.xz | |
Merge branch 'bnx2x'
Yuval Mintz says:
====================
bnx2x: Enhancements & semantic changes series
This patch series contains several semantic (or mostly semantic) patches,
as well as adding support for packet aggregations on the receive path
of windows VMs and updating bnx2x to the new FW recently accepted upstream.
Please consider applying these patches to `net-next'.
(This is a repost as net-next was still closed when this was previously
sent)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/tc_act/tc_nat.h')
0 files changed, 0 insertions, 0 deletions