tree 3c3c6206813a5ba14a52f484c5afe7aadb458d0b
parent ac3f482236793c75caae2c2ebb3f3e5f8b7393e1
parent d9a0a345ab7a58a30ec38e5bb7401a28714914d2
author Linus Torvalds <torvalds@linux-foundation.org> 1247261241 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1247261241 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
  nilfs2: fix disorder in cp count on error during deleting checkpoints
  nilfs2: fix lockdep warning between regular file and inode file
  nilfs2: fix incorrect KERN_CRIT messages in case of write failures
  nilfs2: fix hang problem of log writer which occurs after write failures
  nilfs2: remove unlikely directive causing mis-conversion of error code