From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 22 Aug 2010 16:44:47 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke... 
X-Git-Tag: v2.6.36-rc2~4
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=a28e0852d45e65d9edf249c36e432b5e0a80f01d;p=karo-tx-linux.git

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
---

a28e0852d45e65d9edf249c36e432b5e0a80f01d