]> git.neil.brown.name Git - history.git/commitdiff
projects / history.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 99db2bb 229824a)
Merge bk://jfs.bkbits.net/linux-2.5
authorLinus Torvalds <torvalds@home.transmeta.com>
Wed, 4 Sep 2002 10:23:32 +0000 (03:23 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Wed, 4 Sep 2002 10:23:32 +0000 (03:23 -0700)
into home.transmeta.com:/home/torvalds/v2.5/linux

1  2 
fs/jfs/jfs_logmgr.c patch | diff1 | diff2 | blob | history
fs/jfs/jfs_txnmgr.c patch | diff1 | diff2 | blob | history

diff --cc fs/jfs/jfs_logmgr.c
Simple merge
diff --cc fs/jfs/jfs_txnmgr.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.