From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Jul 2011 05:50:35 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
X-Git-Tag: firefly_0821_release~3680^2~4930
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=91d44d99992ff2587104df5760bfffbb3564b3c2;p=firefly-linux-kernel-4.4.55.git

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
---

91d44d99992ff2587104df5760bfffbb3564b3c2