]> git.neil.brown.name Git - history.git/commitdiff
Merge bk://thebsh.namesys.com/bk/reiser3-linux-2.5-relocation-fix
authorLinus Torvalds <torvalds@home.transmeta.com>
Fri, 14 Mar 2003 10:14:19 +0000 (02:14 -0800)
committerLinus Torvalds <torvalds@home.transmeta.com>
Fri, 14 Mar 2003 10:14:19 +0000 (02:14 -0800)
into home.transmeta.com:/home/torvalds/v2.5/linux


Trivial merge