diff options
author | Linus Torvalds | 2011-03-24 16:02:21 +0100 |
---|---|---|
committer | Linus Torvalds | 2011-03-24 16:02:21 +0100 |
commit | 5818fcc8bd1b27af4d40b8357b91a56cc3fae6a4 (patch) | |
tree | c2f266e82306fa98c78130b0dc79ef9716d3c9c7 /fs/nfsd/vfs.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff) | |
parent | Squashfs: Use vmalloc rather than kmalloc for zlib workspace (diff) | |
download | kernel-qcow2-linux-5818fcc8bd1b27af4d40b8357b91a56cc3fae6a4.tar.gz kernel-qcow2-linux-5818fcc8bd1b27af4d40b8357b91a56cc3fae6a4.tar.xz kernel-qcow2-linux-5818fcc8bd1b27af4d40b8357b91a56cc3fae6a4.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus:
Squashfs: Use vmalloc rather than kmalloc for zlib workspace
Squashfs: handle corruption of directory structure
Squashfs: wrap squashfs_mount() definition
Squashfs: xz_wrapper doesn't need to include squashfs_fs_i.h anymore
Squashfs: Update documentation to include compression options
Squashfs: Update Kconfig help text to include xz compression
Squashfs: add compression options support to xz decompressor
Squashfs: extend decompressor framework to handle compression options
Diffstat (limited to 'fs/nfsd/vfs.c')
0 files changed, 0 insertions, 0 deletions