tree 543b73681f8d1587f578e6c8790312503f781edc
parent 539c89cfdb0e4b58d22a8a89321f36572b299fbc
parent 858f4deb36a66aef25200b29b3074a51df6fd3fc
author David S. Miller <davem@davemloft.net> 1388083106 -0500
committer David S. Miller <davem@davemloft.net> 1388083106 -0500

Merge branch 'bnx2x'

Yuval Mintz says:

====================
bnx2x: new features patch series

This patch series adds/fixes several new features in the bnx2x driver -
it adds support for loading the bnx2x over an UNDI running on a Multi-function
device, adds missing bits for PCIe AER support and enables VFs to properly
configure multicast filters
(In addition, it also contains some small improvements in driver behaviour).

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

Changes from previous versions
------------------------------
  v2:
     - Fixed comment typo in patch 4 (propogate --> propagate)
====================

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