Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 7 Jun 2010 00:42:02 +0000 (17:42 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 7 Jun 2010 00:42:02 +0000 (17:42 -0700)
commiteedc765ca4b19a41cf0b921a492ac08d640060d1
tree95c566c6238cc953e1e336115d2daafe8bcb388f
parente59d44df46edaafb6b637e98d046775524b31104
parent024a07bacf8287a6ddfa83e9d5b951c5e8b4070e
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/sfc/net_driver.h
drivers/net/sfc/siena.c
13 files changed:
drivers/net/benet/be_cmds.c
drivers/net/fec.c
drivers/net/ixgbe/ixgbe_main.c
drivers/net/ppp_generic.c
drivers/net/r8169.c
drivers/net/sfc/net_driver.h
include/net/sock.h
net/core/dev.c
net/ipv4/syncookies.c
net/ipv4/tcp_ipv4.c
net/ipv6/mcast.c
net/ipv6/udp.c
net/mac80211/rx.c