diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-19 19:46:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-19 19:46:45 -0800 |
| commit | b86db4744230c94e480de56f1b7f31117edbf193 (patch) | |
| tree | e94240a428f525c11c8758ebdd50398cec95e7be /fs/nilfs2 | |
| parent | 76db8ac45fc738f7d7664fe9b56d15c594a45228 (diff) | |
| parent | e681c047e47c0abe67bf95857f23814372793cb0 (diff) | |
| download | linux-b86db4744230c94e480de56f1b7f31117edbf193.tar.bz2 | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
ext4: Add EXT4_IOC_TRIM ioctl to handle batched discard
fs: Do not dispatch FITRIM through separate super_operation
ext4: ext4_fill_super shouldn't return 0 on corruption
jbd2: fix /proc/fs/jbd2/<dev> when using an external journal
ext4: missing unlock in ext4_clear_request_list()
ext4: fix setting random pages PageUptodate
Diffstat (limited to 'fs/nilfs2')
0 files changed, 0 insertions, 0 deletions