Merge master.kernel.org:/home/davem/BK/net-2.5
authorLinus Torvalds <torvalds@home.transmeta.com>
Fri, 5 Apr 2002 00:35:14 +0000 (16:35 -0800)
committerLinus Torvalds <torvalds@home.transmeta.com>
Fri, 5 Apr 2002 00:35:14 +0000 (16:35 -0800)
commit901e03ef496173ea253c09db0500c63143adcb4b
treef0c04b78637fadce9886438aa67a4a41b642f7ed
parent94f5af8b9da009017a2051f0504b3aad494c500c
parent88968e1d86cf4e3191932806908c357fdce1db68
Merge master.kernel.org:/home/davem/BK/net-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
include/linux/skbuff.h