Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 22 Aug 2010 16:44:47 +0000 (09:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 22 Aug 2010 16:44:47 +0000 (09:44 -0700)
commita28e0852d45e65d9edf249c36e432b5e0a80f01d
treeb19f4725757252eb070157b06765235138384813
parente36c886a0f9d624377977fa6cae309cfd7f362fa
parent1cb0c924fa2d616e5e3b5bc62d97191aac9ff442
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: wait for discard to finish