Merge head 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 13 Jul 2005 17:37:36 +0000 (10:37 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 13 Jul 2005 17:37:36 +0000 (10:37 -0700)

Trivial merge