]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
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)
1  2 
MAINTAINERS
include/net/sctp/sctp.h
net/core/netpoll.c
net/ipv4/tcp_output.c
net/sctp/ipv6.c
net/sctp/protocol.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/sctp/ipv6.c
Simple merge
Simple merge