From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 27 Apr 2010 15:59:38 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
X-Git-Tag: 2.1b_release~8558
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bc113f151a73cb2195c2fb40d7d70acf8e2f9208;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git

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

* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus:
  squashfs: fix potential buffer over-run on 4K block file systems
  squashfs: add missing buffer free
  squashfs: fix warn_on when root inode is corrupted
  squashfs: fix locking bug in zlib wrapper
---

bc113f151a73cb2195c2fb40d7d70acf8e2f9208