diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 08:02:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 08:02:21 -0700 |
| commit | 5818fcc8bd1b27af4d40b8357b91a56cc3fae6a4 (patch) | |
| tree | c2f266e82306fa98c78130b0dc79ef9716d3c9c7 /kernel/user.c | |
| parent | 0625bef6060fab4aab0e484130b59af5e9ac81bc (diff) | |
| parent | 117a91e0f25fd7698e20ac3dfa62086be3dc82a3 (diff) | |
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 'kernel/user.c')
0 files changed, 0 insertions, 0 deletions