From: Linus Torvalds Date: Fri, 13 Jan 2012 18:34:57 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=96e80a7851b44f3decaac0625665cd64e550b71d;p=~shefty%2Frdma-dev.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next * git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next: Squashfs: fix i_blocks calculation with extended regular files Squashfs: fix mount time sanity check for corrupted superblock Squashfs: optimise squashfs_cache_get entry search Squashfs: Update documentation to include xattrs Squashfs: add missing block release on error condition --- 96e80a7851b44f3decaac0625665cd64e550b71d