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)
commit4ef5c68f0a40a95d63c210ba7e3751540e1cb1f1
tree3e84110be38ec7f2f8a203d92fff07ceb89a2505
parent9fe4145530e6072cc838beb95ca68cada8c56909
parent947b10ae0aeda89fc066a7470fdba55f72b0b8fc
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 regression of garbage collection ioctl