]> git.neil.brown.name Git - history.git/commitdiff
Merge jfs@jfs.bkbits.net:linux-2.5
authorDave Kleikamp <shaggy@kleikamp.austin.ibm.com>
Tue, 18 Jun 2002 09:36:02 +0000 (04:36 -0500)
committerDave Kleikamp <shaggy@kleikamp.austin.ibm.com>
Tue, 18 Jun 2002 09:36:02 +0000 (04:36 -0500)
into kleikamp.austin.ibm.com:/home/shaggy/bk/jfs-2.5

1  2 
fs/jfs/jfs_logmgr.c

Simple merge