Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-next-2.6

2026-10-14 05:55:17 +00:00 · 2011-05-12 23:01:55 -04:00 · 2011-05-12 23:01:55 -04:00 · 5c5095494f
commit 5c5095494f
parent 4d586b823a def57687e9
19 changed files with 283 additions and 191 deletions
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
--- a/drivers/net/vmxnet3/vmxnet3_int.h
+++ b/drivers/net/vmxnet3/vmxnet3_int.h
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
--- a/include/net/garp.h
+++ b/include/net/garp.h
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
--- a/net/802/garp.c
+++ b/net/802/garp.c
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
--- a/net/core/dev.c
+++ b/net/core/dev.c
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
--- a/net/ipv4/ip_forward.c
+++ b/net/ipv4/ip_forward.c
--- a/net/ipv4/ip_options.c
+++ b/net/ipv4/ip_options.c
--- a/net/irda/ircomm/ircomm_tty.c
+++ b/net/irda/ircomm/ircomm_tty.c
--- a/net/l2tp/l2tp_core.c
+++ b/net/l2tp/l2tp_core.c
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
--- a/net/netfilter/ipvs/ip_vs_xmit.c
+++ b/net/netfilter/ipvs/ip_vs_xmit.c
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c