]> git.neil.brown.name Git - history.git/commitdiff
projects / history.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f9506f4 b32c3a0)
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 patch | diff1 | diff2 | blob | history
fs/reiserfs/stree.c patch | diff1 | diff2 | blob | history

diff --cc fs/reiserfs/inode.c
Simple merge
diff --cc fs/reiserfs/stree.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.