Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net...
authorDavid S. Miller <davem@davemloft.net>
Wed, 31 Oct 2012 18:25:33 +0000 (14:25 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 31 Oct 2012 18:26:44 +0000 (14:26 -0400)
commit810b6d7638a288216f99bd190470d67061c8bd88
tree5c8dd20b10cf4d7d40d286c9b3dd71d6dedaf78c
parentf7b4fb22b838f895ce9fa994f0ef4f7f541f5266
parentac61d515f14fd205d8c917a34b27a767b4fe9e05
Merge branch 'master' of git://git./linux/kernel/git/jkirsher/net-next

Jeff Kirsher says:

====================
This series contains updates to ixgbe, ixgbevf, igbvf, igb and
networking core (bridge).  Most notably is the addition of support
for local link multicast addresses in SR-IOV mode to the networking
core.

Also note, the ixgbe patch "ixgbe: Add support for pipeline reset" and
"ixgbe: Fix return value from macvlan filter function" is revised based
on community feedback.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
net/bridge/br_device.c
net/bridge/br_private.h