diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-10 00:04:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-10 00:04:35 -0800 |
| commit | 25f666300625d894ebe04bac2b4b3aadb907c861 (patch) | |
| tree | 47547369f2d6eb366268e85252444ecb1bdcfab5 /include/linux | |
| parent | 0b6ca82af83a79f3d1001c8a0701ed34ac38126e (diff) | |
| parent | 21347456abfbf5bc7fcace7327476736bbb28abe (diff) | |
| download | kernel_samsung_aries-25f666300625d894ebe04bac2b4b3aadb907c861.zip kernel_samsung_aries-25f666300625d894ebe04bac2b4b3aadb907c861.tar.gz kernel_samsung_aries-25f666300625d894ebe04bac2b4b3aadb907c861.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (28 commits)
[NET_SCHED] sch_htb: htb_requeue fix
[IPV6]: Replace using the magic constant "1024" with IP6_RT_PRIO_USER for fc_metric.
starfire: secton fix
via-velocity: section fix
natsemi: section fix
typhoon: section fix
isdn: fix section mismatch warning for ISACVer
isdn: fix section mismatch warnings from hisax_cs_setup_card
isdn: fix section mismatch warnings in isac.c and isar.c
isdn: fix section mismatch warning in hfc_sx.c
[PKT_SCHED] ematch: tcf_em_destroy robustness
[PKT_SCHED]: deinline functions in meta match
[SCTP]: Convert sctp_dbg_objcnt to seq files.
[SCTP]: Use snmp_fold_field instead of a homebrew analogue.
[IGMP]: Optimize kfree_skb in igmp_rcv.
[KEY]: Convert net/pfkey to use seq files.
[KEY]: Clean up proc files creation a bit.
pppol2tp: fix printk warnings
bnx2: section fix
bnx2x: section fix
...
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/sctp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/sctp.h b/include/linux/sctp.h index 5eb38cc..8ba1c32 100644 --- a/include/linux/sctp.h +++ b/include/linux/sctp.h @@ -10,13 +10,13 @@ * * Various protocol defined structures. * - * The SCTP reference implementation is free software; + * This SCTP implementation is free software; * you can redistribute it and/or modify it under the terms of * the GNU General Public License as published by * the Free Software Foundation; either version 2, or (at your option) * any later version. * - * The SCTP reference implementation is distributed in the hope that it + * This SCTP implementation is distributed in the hope that it * will be useful, but WITHOUT ANY WARRANTY; without even the implied * ************************ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |