Merge branches 'release' and 'hp-cid' into release
[linux-2.6] / net / sctp / command.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2