]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f12baea 7038f1c)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 19:44:24 +0000 (12:44 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 19:44:24 +0000 (12:44 -0700)
1  2 
fs/jfs/jfs_metapage.c patch | diff1 | diff2 | blob | history

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