Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Jan 2012 18:34:57 +0000 (10:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Jan 2012 18:34:57 +0000 (10:34 -0800)
commit96e80a7851b44f3decaac0625665cd64e550b71d
treea24d9f46c43b5fcf824c49b93d37982ab668aade
parent57e6a7dde8cfca9ac1d6702cf9104d22bc11ba90
parent3d4a1c80c4eb97187b3a61b3bfa8c804327f7a45
Merge git://git./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
fs/squashfs/super.c