]> nv-tegra.nvidia Code Review - linux-3.10.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Mar 2011 15:02:21 +0000 (08:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Mar 2011 15:02:21 +0000 (08:02 -0700)
commit5818fcc8bd1b27af4d40b8357b91a56cc3fae6a4
treec2f266e82306fa98c78130b0dc79ef9716d3c9c7
parent0625bef6060fab4aab0e484130b59af5e9ac81bc
parent117a91e0f25fd7698e20ac3dfa62086be3dc82a3
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