From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 29 Mar 2012 01:05:54 +0000 (-0700)
Subject: Merge tag 'squashfs-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/pkl... 
X-Git-Tag: v3.4-rc1~52
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8563f8786ee389c7861938d1d25336706f6de187;p=platform%2Fkernel%2Flinux-stable.git

Merge tag 'squashfs-updates' of git://git./linux/kernel/git/pkl/squashfs-next

Pull squashfs updates from Phillip Lougher:
 "Add an extra mount time sanity check, plus some code cleanups and bug
  fixes."

* tag 'squashfs-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next:
  Squashfs: add mount time sanity check for block_size and block_log match
  Squashfs: fix f_pos check in get_dir_index_using_offset
  Squashfs: get rid of obsolete definitions in header file
  Squashfs: remove redundant length initialisation in squashfs_lookup
  Squashfs: remove redundant length initialisation in squashfs_readdir
  Squashfs: update comment removing reference to zlib only
  Squashfs: use define instead of constant
---

8563f8786ee389c7861938d1d25336706f6de187