From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 16 Jan 2011 20:11:13 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
X-Git-Tag: v2.6.38-rc1~32
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5520ebd308927a3beba599a2b68fa8c52f41f43b;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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

5520ebd308927a3beba599a2b68fa8c52f41f43b