Merge home.transmeta.com:/home/torvalds/v2.5/knfsd
authorLinus Torvalds <torvalds@home.transmeta.com>
Mon, 18 Feb 2002 00:43:08 +0000 (16:43 -0800)
committerLinus Torvalds <torvalds@home.transmeta.com>
Mon, 18 Feb 2002 00:43:08 +0000 (16:43 -0800)
commitacb977dc706c1b20292fdd2dd9da5c6f62359d31
treed42d800958ee360774da5563cbd30324a45842ca
parent222099f6c32004454f8c44ade53135adc2e1b179
parentc0d68f59d42484a261ea0ecf49749f2b8792f632
Merge home.transmeta.com:/home/torvalds/v2.5/knfsd
into home.transmeta.com:/home/torvalds/v2.5/linux