summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-08-03 21:52:00 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-08-03 21:52:00 -0700
commite4e08ed23d9692b501fe9c298d0476708e3e5886 (patch)
treea951b7ade939d3ef5cf0769de0c25f20bfe1704c /kernel
parent2b6165ae49f54f9d8b4d5b9a1c4315c346375668 (diff)
parentbe9ca388d4651d0021b6354ad3c7ed55ff534149 (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