tree 57e0ed5a753c55f1693d7fe8628b4411ab5ae71d
parent c0ac515e2951dd2a999cfd21dea3fdc1055f1573
parent 59192ed9e7aa81b06a1803661419f7261afca1ad
author Linus Torvalds <torvalds@g5.osdl.org> 1121276256 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1121276256 -0700

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