Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 2 Oct 2006 15:27:09 +0000 (08:27 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 2 Oct 2006 15:27:09 +0000 (08:27 -0700)
commit44f549217cd26daf7063984ae4ee6e46beca9c41
tree8128955710d052cf2485857e58e616304989b13e
parent3e04767a4647ea6c61ed05abe803c052ce123960
parent63f83c9fcf40ab61b75edf5d2f2c1ae6bf876482
Merge branch 'for-linus' of git://git./linux/kernel/git/shaggy/jfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
  JFS: White space cleanup
  [PATCH] JFS: return correct error when i-node allocation failed
  JFS: Remove shadow variable from fs/jfs/jfs_txnmgr.c:xtLog()