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

[SCTP]: Stop claiming that this is a "reference implementation"

2008-02-05 10:59:07 -05:00

checksum.h

[SCTP]: Use crc32c library for checksum calculations.

2008-01-28 14:58:20 -08:00

command.h

[SCTP]: Stop claiming that this is a "reference implementation"

2008-02-05 10:59:07 -05:00

constants.h

[SCTP]: Stop claiming that this is a "reference implementation"

2008-02-05 10:59:07 -05:00

sctp.h

Merge branch 'master' of ../net-2.6/

2008-03-23 22:54:03 -07:00

sm.h

[SCTP]: Stop claiming that this is a "reference implementation"

2008-02-05 10:59:07 -05:00

structs.h

[SCTP]: Remove redundant wrapper functions.

2008-03-23 22:47:08 -07:00

tsnmap.h

[SCTP]: Stop claiming that this is a "reference implementation"

2008-02-05 10:59:07 -05:00

ulpevent.h

[SCTP]: Stop claiming that this is a "reference implementation"

2008-02-05 10:59:07 -05:00

ulpqueue.h

[SCTP]: Stop claiming that this is a "reference implementation"

2008-02-05 10:59:07 -05:00

user.h

[SCTP]: Update AUTH structures to match declarations in draft-16.

2008-02-28 16:45:04 -05:00