]> git.hungrycats.org Git - linux/commit
Resolve conflicts.
authorDavid S. Miller <davem@nuts.ninka.net>
Sun, 2 Mar 2003 17:01:01 +0000 (09:01 -0800)
committerDavid S. Miller <davem@nuts.ninka.net>
Sun, 2 Mar 2003 17:01:01 +0000 (09:01 -0800)
commitab315ecd9bb766b54644b44ec06dc8766e029fc5
treed8826cd940289dd3ddfa1ceb7a2f22c21fd97b07
parentde0016d4e280d3d5912bf14ba11473480052a1aa
parent294cb923593ab08df3fbec89bbe57662c1791e7e
Resolve conflicts.
include/net/sctp/structs.h
include/net/sctp/ulpqueue.h
include/net/sctp/user.h
net/sctp/ipv6.c
net/sctp/outqueue.c
net/sctp/sm_statefuns.c
net/sctp/ulpevent.c
net/sctp/ulpqueue.c