summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-08-04 19:00:05 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-08-04 19:00:05 -0700
commitd7d823ed760f18d23283a8bae222b3204a04cf6f (patch)
treef4266f49e7ee3ce87ede5e6be87ca481d228426e /kernel
parente4e08ed23d9692b501fe9c298d0476708e3e5886 (diff)
parent5f0a957160eb637324b1eeffaf368b734bc42525 (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