]> git.hungrycats.org Git - linux/commitdiff
Merge bk://thebsh.namesys.com/bk/reiser3-linux-2.5
authorLinus Torvalds <torvalds@home.transmeta.com>
Mon, 9 Sep 2002 01:41:49 +0000 (18:41 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Mon, 9 Sep 2002 01:41:49 +0000 (18:41 -0700)
into home.transmeta.com:/home/torvalds/v2.5/linux

1  2 
fs/reiserfs/inode.c
fs/reiserfs/stree.c

Simple merge
Simple merge