summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-04-02 01:08:15 -0800
committerLinus Torvalds <torvalds@home.transmeta.com>2002-04-02 01:08:15 -0800
commit365f5347bff2f2c0434e82a155b9cc4c67919e58 (patch)
tree8b9675ade375c1329dff2a8aa2abf6bb814c00ca /kernel
parentde466adfe7378e07e3b37767d39df1d1aee98d89 (diff)
parente2da4b9e2e156441b3cbc56050d204aab0be2a94 (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