From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 Mar 2010 22:14:29 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke... 
X-Git-Tag: v2.6.34-rc3~19
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e4d50423d773fb8d5b714430ba5358e8a1b87c14;p=~emulex%2Finfiniband.git

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 imperfect completion wait in nilfs_wait_on_logs
  nilfs2: fix hang-up of cleaner after log writer returned with error
  nilfs2: fix duplicate call to nilfs_segctor_cancel_freev
---

e4d50423d773fb8d5b714430ba5358e8a1b87c14