]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d5dbd0 3ee68c4)
Merge with /home/shaggy/git/linus-clean/
authorDave Kleikamp <shaggy@austin.ibm.com>
Tue, 24 Jan 2006 20:34:47 +0000 (14:34 -0600)
committerDave Kleikamp <shaggy@austin.ibm.com>
Tue, 24 Jan 2006 20:34:47 +0000 (14:34 -0600)
1  2 
fs/jfs/jfs_dmap.c patch | diff1 | diff2 | blob | history

diff --cc fs/jfs/jfs_dmap.c
Simple merge
Linux 2.6 source tree