David S. Miller 06802a819a Merge branch 'master' of ../net-2.6/ ... Conflicts: net/ipv6/ndisc.c		2008-03-23 22:54:03 -07:00
..
auth.h
checksum.h
command.h
constants.h
sctp.h	Merge branch 'master' of ../net-2.6/	2008-03-23 22:54:03 -07:00
sm.h
structs.h	[SCTP]: Remove redundant wrapper functions.	2008-03-23 22:47:08 -07:00
tsnmap.h
ulpevent.h
ulpqueue.h
user.h	[SCTP]: Update AUTH structures to match declarations in draft-16.	2008-02-28 16:45:04 -05:00