tree b19f4725757252eb070157b06765235138384813
parent e36c886a0f9d624377977fa6cae309cfd7f362fa
parent 1cb0c924fa2d616e5e3b5bc62d97191aac9ff442
author Linus Torvalds <torvalds@linux-foundation.org> 1282495487 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1282495487 -0700

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: wait for discard to finish