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)
* 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

1  2 
fs/squashfs/super.c

Simple merge