]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca27ea4 2d610b8)
Merge head 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 16 Aug 2005 19:12:30 +0000 (12:12 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 16 Aug 2005 19:12:30 +0000 (12:12 -0700)

Trivial merge
Linux 2.6 source tree