838beb95ca68cada8c56909
parent 947b10ae0aeda89fc066a7470fdba55f72b0b8fc
author Linus Torvalds <torvalds@linux-foundation.org> 1292517262 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1292517262 -0800

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 of garbage collection ioctl