tree 8128955710d052cf2485857e58e616304989b13e
parent 3e04767a4647ea6c61ed05abe803c052ce123960
parent 63f83c9fcf40ab61b75edf5d2f2c1ae6bf876482
author Linus Torvalds <torvalds@g5.osdl.org> 1159802829 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1159802829 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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()