Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Dec 2010 16:34:22 +0000 (08:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Dec 2010 16:34:22 +0000 (08:34 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
  nilfs2: fix regression of garbage collection ioctl


Trivial merge