Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 17 May 2010 05:26:58 +0000 (22:26 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 17 May 2010 05:26:58 +0000 (22:26 -0700)
commit6811d58fc148c393f80a9f5a9db49d7e75cdc546
treec25d5b0e49ec848943d35f819e748d157ccb492e
parentc4949f074332a64baeb2ead6ab9319ca37642f96
parentc02db8c6290bb992442fec1407643c94cc414375
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
include/linux/if_link.h
drivers/vhost/vhost.c
include/linux/if_link.h
include/net/tcp.h
net/core/rtnetlink.c
net/ipv4/tcp.c
net/sctp/transport.c