Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 7 Jul 2010 22:59:38 +0000 (15:59 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 7 Jul 2010 22:59:38 +0000 (15:59 -0700)
commit597e608a8492d662736c9bc6aa507dbf1cadc17d
tree6c330cdd0a4809f67dd191b37e34f5b4318cef78
parentacbc0f039ff4b93da737c91937b7c70018ded39f
parent33b665eeeb85956ccbdf31c4c31a4e2a31133c44
Merge branch 'master' of /linux/kernel/git/davem/net-2.6
21 files changed:
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