Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Sat, 14 Jun 2008 03:52:39 +0000 (20:52 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 14 Jun 2008 03:52:39 +0000 (20:52 -0700)
commit4ae127d1b6c71f9240dd4245f240e6dd8fc98014
treeb7aa27b3e0c655f4613fe2146cb57d7f69e421f6
parent875ec4333b99144e2589e900a0bcd2c25c757b27
parent7775c9753b94fe429dc4323360d6502c95e0dd6e
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:

drivers/net/smc911x.c
28 files changed:
drivers/net/Kconfig
drivers/net/atlx/atl1.c
drivers/net/bnx2.c
drivers/net/bnx2.h
drivers/net/forcedeth.c
drivers/net/s2io.c
drivers/net/sfc/falcon.c
drivers/net/sky2.c
drivers/net/smc911x.c
drivers/net/smc911x.h
include/linux/pci_ids.h
include/linux/tcp.h
include/net/tcp.h
net/ipv4/fib_semantics.c
net/ipv4/syncookies.c
net/ipv4/tcp.c
net/ipv4/tcp_input.c
net/ipv4/tcp_ipv4.c
net/ipv4/tcp_minisocks.c
net/ipv4/tcp_timer.c
net/ipv6/datagram.c
net/ipv6/ip6mr.c
net/ipv6/ipv6_sockglue.c
net/ipv6/raw.c
net/ipv6/route.c
net/ipv6/tcp_ipv6.c
net/key/af_key.c
net/netfilter/nf_conntrack_core.c