From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Mar 2010 18:46:04 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
X-Git-Tag: v3.0~5866
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b24bc1e61cec2174faf5dfa632da16b6ca17144f;p=platform%2Fkernel%2Flinux-amlogic.git

Merge git://git./linux/kernel/git/pkl/squashfs-linus

* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus:
  Squashfs: get rid of obsolete definition in header file
  Squashfs: get rid of obsolete variable in struct squashfs_sb_info
  Squashfs: add decompressor entries for lzma and lzo
  Squashfs: add a decompressor framework
  Squashfs: factor out remaining zlib dependencies into separate wrapper file
  Squashfs: move zlib decompression wrapper code into a separate file
---

b24bc1e61cec2174faf5dfa632da16b6ca17144f