tree f733a7229cd3d62b5a19a2cbbceea1118c31f237
parent 839c5d2511fadc35cc4e8a8ffa833d76668700b2
parent 18190cc08d70a6ec8ef69f0f6ede021f7cb3f9b8
author Linus Torvalds <torvalds@g5.osdl.org> 1122507742 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1122507742 -0700

Merge head 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6