Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Jul 2011 05:50:35 +0000 (22:50 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Jul 2011 05:50:35 +0000 (22:50 -0700)
commit91d44d99992ff2587104df5760bfffbb3564b3c2
tree71316dfc11385f5594962f91d7192fdd851e86a8
parent2dad3206db5c3832cde1f58650027fea3ff7adf3
parentcc6d3497141adedb71de8ddce62bf4cd4817832d
Merge git://git./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