| commit | a28e0852d45e65d9edf249c36e432b5e0a80f01d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Aug 22 09:44:47 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Aug 22 09:44:47 2010 -0700 |
| tree | b19f4725757252eb070157b06765235138384813 | |
| parent | e36c886a0f9d624377977fa6cae309cfd7f362fa [diff] | |
| parent | 1cb0c924fa2d616e5e3b5bc62d97191aac9ff442 [diff] |
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