Merge head 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 13 Jul 2005 17:37:36 +0000 (10:37 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 13 Jul 2005 17:37:36 +0000 (10:37 -0700)
commitc327ff6250fb558659ad689fe33f50524eda74e3
tree57e0ed5a753c55f1693d7fe8628b4411ab5ae71d
parentc0ac515e2951dd2a999cfd21dea3fdc1055f1573
parent59192ed9e7aa81b06a1803661419f7261afca1ad
Merge head 'for-linus' of /linux/kernel/git/shaggy/jfs-2.6