]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce08711 0fca85e)
Automerge
authorLinus Torvalds <torvalds@penguin.transmeta.com>
Thu, 4 Apr 2002 06:36:14 +0000 (22:36 -0800)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Thu, 4 Apr 2002 06:36:14 +0000 (22:36 -0800)
1  2 
fs/jfs/jfs_txnmgr.c patch | diff1 | diff2 | blob | history

diff --cc fs/jfs/jfs_txnmgr.c
Simple merge
Linux kernels and configurations used by Zygo.