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