Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 3 May 2010 04:43:40 +0000 (21:43 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 3 May 2010 05:02:06 +0000 (22:02 -0700)
commit7ef527377b88ff05fb122a47619ea506c631c914
tree2c2e774527d5f591b975834f43e8c6fd12fb38f2
parent47d29646a2c1c147d8a7598aeac2c87dd71ed638
parent1183f3838c588545592c042c0ce15015661ce7f2
Merge branch 'master' of /linux/kernel/git/davem/net-2.6
17 files changed:
drivers/net/bnx2.c
drivers/net/e1000e/netdev.c
drivers/net/gianfar.c
drivers/net/pcmcia/smc91c92_cs.c
drivers/net/sb1250-mac.c
drivers/net/sfc/efx.c
drivers/net/sfc/falcon.c
drivers/net/sfc/nic.h
drivers/net/sfc/siena.c
drivers/net/usb/cdc_ether.c
drivers/net/wireless/p54/p54pci.c
include/net/sctp/sctp.h
include/net/sock.h
net/bluetooth/l2cap.c
net/ipv4/inet_connection_sock.c
net/ipv6/inet6_connection_sock.c
net/sctp/socket.c