]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28079d2 a2bc3d8)
Merge shaggy.austin.ibm.com:/shaggy/bk/linus-2.5
authorDave Kleikamp <shaggy@shaggy.austin.ibm.com>
Mon, 24 Mar 2003 09:52:39 +0000 (03:52 -0600)
committerDave Kleikamp <shaggy@shaggy.austin.ibm.com>
Mon, 24 Mar 2003 09:52:39 +0000 (03:52 -0600)
into shaggy.austin.ibm.com:/shaggy/bk/jfs-2.5

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.