]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 30c4273 1c70608)
Merge kleikamp.austin.ibm.com:/home/shaggy/bk/jfs-2.5
authorDave Kleikamp <shaggy@kleikamp.austin.ibm.com>
Mon, 5 Aug 2002 04:03:22 +0000 (23:03 -0500)
committerDave Kleikamp <shaggy@kleikamp.austin.ibm.com>
Mon, 5 Aug 2002 04:03:22 +0000 (23:03 -0500)
into kleikamp.austin.ibm.com:/home/shaggy/bk/resize-2.5

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

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