tree 5faee830194d778a9bb63317bc6ff7f8962a976b
parent 1583171492eb514e267c7b51e96846b38de0f544
parent 7657cacf478940b995c2c73fdff981c13cc62c5c
author Linus Torvalds <torvalds@linux-foundation.org> 1320450517 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1320450517 -0700

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: Add an option to set dev block size to 4K