diff options
author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-12 21:51:51 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-12 21:51:51 -0500 |
commit | 775ba7ad491a154f99871fe603f03366e84ae159 (patch) | |
tree | 7112bd513ff7c60033f4ba07790cab8a7d3195a2 /net | |
parent | d9405057c18cdc62eade7106a774d87a3e080875 (diff) | |
parent | 18b36c7119aa868fdfae6855b86824db238e5ebc (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
Fix inotify maintainers entry
Fix typo in new debug options.
Jon needs a new shift key.
fs: Convert kmalloc() + memset() to kzalloc() in fs/.
configfs.h: Remove dead macro definitions.
kconfig: Standardize "depends" -> "depends on" in Kconfig files
e100: replace kmalloc with kcalloc
um: replace kmalloc+memset with kzalloc
fix typo in net/ipv4/ip_fragment.c
include/linux/compiler.h: reject gcc 3 < gcc 3.2
Kconfig: fix spelling error in config KALLSYMS help text
Remove duplicate "have to" in comment
Fix small typo in drivers/serial/icom.c
Use consistent casing in help message
EXT{2,3,4}_FS: remove outdated part of the help text
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/ip_fragment.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index 74046efdf875..8ce00d3703da 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c | |||
@@ -565,7 +565,7 @@ static void ip_frag_queue(struct ipq *qp, struct sk_buff *skb) | |||
565 | } else { | 565 | } else { |
566 | struct sk_buff *free_it = next; | 566 | struct sk_buff *free_it = next; |
567 | 567 | ||
568 | /* Old fragmnet is completely overridden with | 568 | /* Old fragment is completely overridden with |
569 | * new one drop it. | 569 | * new one drop it. |
570 | */ | 570 | */ |
571 | next = next->next; | 571 | next = next->next; |