]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 836eeed 6b6bf51)
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2...
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 4 May 2005 21:23:14 +0000 (14:23 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 4 May 2005 21:23:14 +0000 (14:23 -0700)

Trivial merge
Linux 2.6 source tree