summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-11-18 03:02:31 -0800
committerLinus Torvalds <torvalds@home.transmeta.com>2002-11-18 03:02:31 -0800
commitaedcae64622b64b2daa6597091834c7a40667835 (patch)
treecc16786699179619f07f8522591bb4708bd318d0 /kernel
parent8309fa386b92679d55f84ea3f21265ea4ab3e50c (diff)
parent71f55998763de6fe10e3d17c2f1a60ee0ab45761 (diff)
Merge master.kernel.org:/home/davem/BK/net-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions