]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitf14db873de49602545c2c38327ec4eeb5dc23c06
tree8128955710d052cf2485857e58e616304989b13e
parentc312698c558d6a01d885b4e9910e81f564388106
parentd8ca20497687adf413a6f0e9832ad935253df076
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()