Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Nov 2011 23:48:37 +0000 (16:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Nov 2011 23:48:37 +0000 (16:48 -0700)
commit044595d4e448305fbaec472eb7d22636d24e7d8c
tree5faee830194d778a9bb63317bc6ff7f8962a976b
parent1583171492eb514e267c7b51e96846b38de0f544
parent7657cacf478940b995c2c73fdff981c13cc62c5c
Merge git://git./linux/kernel/git/pkl/squashfs-next

* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next:
  Squashfs: Add an option to set dev block size to 4K
fs/squashfs/Kconfig