Merge head 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 27 Jul 2005 23:42:22 +0000 (16:42 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 27 Jul 2005 23:42:22 +0000 (16:42 -0700)
commit49302d0c42592b37f49ae96e0f06a3599cf5a8a0
treef733a7229cd3d62b5a19a2cbbceea1118c31f237
parent839c5d2511fadc35cc4e8a8ffa833d76668700b2
parent18190cc08d70a6ec8ef69f0f6ede021f7cb3f9b8
Merge head 'for-linus' of /linux/kernel/git/shaggy/jfs-2.6