tree 5c8dd20b10cf4d7d40d286c9b3dd71d6dedaf78c
parent f7b4fb22b838f895ce9fa994f0ef4f7f541f5266
parent ac61d515f14fd205d8c917a34b27a767b4fe9e05
author David S. Miller <davem@davemloft.net> 1351707933 -0400
committer David S. Miller <davem@davemloft.net> 1351708004 -0400

Merge branch 'master' of git://git.kernel.org/pub/scm/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>