Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 21 Mar 2008 10:42:24 +0000 (03:42 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 21 Mar 2008 10:42:24 +0000 (03:42 -0700)
commita25606c845856e5ca5ed54d23cab077e3a49bf10
tree1721e46532d6f48d605d401d7cee83f78f551c45
parent938b93adb2642885e688390396472d22a7548748
parent94833dfb8c98ed4ca1944dd2c1339d88a2d1c758
Merge branch 'master' of git://git./linux/kernel/git/davem/net-2.6
MAINTAINERS
include/net/sctp/sctp.h
net/core/netpoll.c
net/ipv4/tcp_output.c
net/sctp/ipv6.c
net/sctp/protocol.c