From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Mar 2011 20:42:48 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke... 
X-Git-Tag: v2.6.38-rc8~33
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c640e13f8efeb38daa4c0b0891a46d32b01e51ac;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 regression that i-flag is not set on changeless checkpoints
---

c640e13f8efeb38daa4c0b0891a46d32b01e51ac