summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-11-07 17:16:18 -0800
committerLinus Torvalds <torvalds@home.transmeta.com>2002-11-07 17:16:18 -0800
commit35d5a4b59c47552893614c007899d85c2dd151cd (patch)
tree03233f658d7b5c75e4471c2ab8fa07535cb544dd /kernel
parentaaf75c12437681bd22c2b551a4b5485e8176531a (diff)
parent6c5439180d122fee4d30488cab855c95a65a6c64 (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