Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Wed, 7 Jul 2010 22:59:38 +0000 (15:59 -0700)]
21 files changed:
1  2 
drivers/net/bonding/bond_alb.c
drivers/net/bonding/bond_main.c
drivers/net/cpmac.c
drivers/net/ixgbe/ixgbe_main.c
drivers/net/ll_temac_main.c
drivers/net/mv643xx_eth.c
drivers/net/qlge/qlge_main.c
drivers/net/s2io.c
drivers/net/usb/usbnet.c
drivers/net/vxge/vxge-main.c
drivers/vhost/net.c
drivers/vhost/vhost.c
include/linux/ethtool.h
include/linux/netdevice.h
include/net/sch_generic.h
net/bridge/br_netfilter.c
net/core/dev.c
net/core/ethtool.c
net/ipv4/xfrm4_policy.c
net/ipv6/ndisc.c
net/xfrm/xfrm_policy.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/core/dev.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge