tree 1f47f0e30fd93a7d867382bc478d501436371e1a
parent ca27ea487ea10bd22459dbc367cf263f1e8d5228
parent 2d610b80e954045ccfc27558f84e482709e5e5b7
author Linus Torvalds <torvalds@g5.osdl.org> 1124219550 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1124219550 -0700

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