From: Linus Torvalds 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: v2.6.34-rc6~24 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc113f151a73cb2195c2fb40d7d70acf8e2f9208;p=pandora-kernel.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 Reading git-diff-tree failed