summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-08-01 06:32:45 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-08-01 06:32:45 -0700
commit346f29908f2e084a4c3d160f51126c2ec0878792 (patch)
tree7e4a225293ff5cceab3521718b8438a966099222 /kernel
parent009d4130ec4b1492c191aaa6c110212fb047626d (diff)
parent06ea238b903a7a845946473f99e2fea1d7f7daca (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