| commit | 5520ebd308927a3beba599a2b68fa8c52f41f43b | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sun, 16 Jan 2011 20:11:13 +0000 (16 12:11 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sun, 16 Jan 2011 20:11:13 +0000 (16 12:11 -0800) | ||
| tree | b0395c15af7d096e6e6172a9d47bb7a8dec6add0 | treesnapshot (tar.gz zip) |
| parent | d3072e6a7e9bf7aca200370317f8e297be360b17 | commitdiff |
| parent | 01a678c5a2f41663b8faf03d17e2bbdbf44158a9 | commitdiff |
Merge git://git./linux/kernel/git/pkl/squashfs-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus:
Squashfs: simplify CONFIG_SQUASHFS_LZO handling
Squashfs: move squashfs_i() definition from squashfs.h
Squashfs: get rid of default n in Kconfig
Squashfs: add missing check in zlib_wrapper
Squashfs: remove unnecessary variable in zlib_wrapper
Squashfs: Add XZ compression configuration option
Squashfs: add XZ compression support
* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus:
Squashfs: simplify CONFIG_SQUASHFS_LZO handling
Squashfs: move squashfs_i() definition from squashfs.h
Squashfs: get rid of default n in Kconfig
Squashfs: add missing check in zlib_wrapper
Squashfs: remove unnecessary variable in zlib_wrapper
Squashfs: Add XZ compression configuration option
Squashfs: add XZ compression support