Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 23 Sep 2005 14:40:53 +0000 (07:40 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 23 Sep 2005 14:40:53 +0000 (07:40 -0700)

Trivial merge