Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Jun 2011 17:32:24 +0000 (10:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Jun 2011 17:32:24 +0000 (10:32 -0700)
commit33a538833f1dc46965d11cff1efa756702a9b138
tree7d3c91618422f263356d28ade3c179c92c3c02c1
parent3c25fa740e2084a3950f581378ec29a3c307ddfc
parent071d73cfe5c38cf62338b952bd350ff3de541b75
Merge branch 'for-linus' of git://git./linux/kernel/git/ryusuke/nilfs2

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
  nilfs2: fix problem in setting checkpoint interval
  nilfs2: fix missing block address termination in btree node shrinking
  nilfs2: fix incorrect block address termination in node concatenation