Hand merge.

5f6c1284 · David S. Miller · 75541efd · 574b2d87 · 5f6c1284 · 5f6c1284
Commit 5f6c1284 authored Jun 07, 2002 by David S. Miller
Expand all Show whitespace changes
Inline Side-by-side

Showing with 469 additions and 493 deletions

include/linux/skbuff.h include/linux/skbuff.h +245 -254

net/core/skbuff.c net/core/skbuff.c +224 -239

No files found.
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c