| commit | 91d44d99992ff2587104df5760bfffbb3564b3c2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jul 25 22:50:35 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jul 25 22:50:35 2011 -0700 |
| tree | 71316dfc11385f5594962f91d7192fdd851e86a8 | |
| parent | 2dad3206db5c3832cde1f58650027fea3ff7adf3 [diff] | |
| parent | cc6d3497141adedb71de8ddce62bf4cd4817832d [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: Make ZLIB compression support optional Squashfs: Update documentation for XZ and add squashfs-tools devel tree