Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 6 Jul 2011 06:23:37 +0000 (23:23 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 6 Jul 2011 06:23:37 +0000 (23:23 -0700)
commite12fe68ce34d60c04bb1ddb1d3cc5c3022388fe4
tree83c0e192ccaa4752c80b6131a7d0aa8272b5d0d0
parent7329f0d58de01878d9ce4f0be7a76e136f223eef
parent712ae51afd55b20c04c5383d02ba5d10233313b1
Merge branch 'master' of /linux/kernel/git/davem/net-2.6
21 files changed:
MAINTAINERS
drivers/net/8139too.c
drivers/net/Kconfig
drivers/net/bnx2x/bnx2x_main.c
drivers/net/can/Kconfig
drivers/net/greth.c
drivers/net/qlge/qlge.h
drivers/net/qlge/qlge_main.c
drivers/net/r8169.c
drivers/net/rionet.c
drivers/net/vmxnet3/vmxnet3_drv.c
drivers/net/vmxnet3/vmxnet3_int.h
include/linux/pci_ids.h
include/net/sock.h
net/8021q/vlan_dev.c
net/ipv4/af_inet.c
net/ipv4/ip_output.c
net/ipv4/udp.c
net/ipv6/route.c
net/sunrpc/auth_gss/auth_gss.c
net/sunrpc/clnt.c