]> git.neil.brown.name Git - history.git/commitdiff
Merge bk://thebsh.namesys.com/bk/reiser3-linux-2.5
authorLinus Torvalds <torvalds@home.transmeta.com>
Tue, 6 Aug 2002 15:47:43 +0000 (08:47 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Tue, 6 Aug 2002 15:47:43 +0000 (08:47 -0700)
into home.transmeta.com:/home/torvalds/v2.5/linux


Trivial merge