diff options
author | David S. Miller <davem@davemloft.net> | 2012-10-31 14:25:33 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-10-31 14:26:44 -0400 |
commit | 810b6d7638a288216f99bd190470d67061c8bd88 (patch) | |
tree | 5c8dd20b10cf4d7d40d286c9b3dd71d6dedaf78c /drivers/net/tun.c | |
parent | ethernet: Convert dev_printk(KERN_<LEVEL> to dev_<level>( (diff) | |
parent | igb: Fix sparse warning in igb_ptp_rx_pktstamp (diff) | |
download | linux-dev-810b6d7638a288216f99bd190470d67061c8bd88.tar.xz linux-dev-810b6d7638a288216f99bd190470d67061c8bd88.zip |
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>
Diffstat (limited to 'drivers/net/tun.c')
0 files changed, 0 insertions, 0 deletions