diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-22 09:44:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-22 09:44:47 -0700 |
| commit | a28e0852d45e65d9edf249c36e432b5e0a80f01d (patch) | |
| tree | b19f4725757252eb070157b06765235138384813 /mm/slab.c | |
| 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
Diffstat (limited to 'mm/slab.c')
0 files changed, 0 insertions, 0 deletions