diff options
author | 2010-08-22 09:44:47 -0700 | |
---|---|---|
committer | 2010-08-22 09:44:47 -0700 | |
commit | a28e0852d45e65d9edf249c36e432b5e0a80f01d (patch) | |
tree | b19f4725757252eb070157b06765235138384813 /arch/x86/mm/fault.c | |
parent | workqueue: Add basic tracepoints to track workqueue execution (diff) | |
parent | nilfs2: wait for discard to finish (diff) | |
download | linux-dev-a28e0852d45e65d9edf249c36e432b5e0a80f01d.tar.xz linux-dev-a28e0852d45e65d9edf249c36e432b5e0a80f01d.zip |
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 'arch/x86/mm/fault.c')
0 files changed, 0 insertions, 0 deletions