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)
* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next:
  Squashfs: Add an option to set dev block size to 4K

1  2 
fs/squashfs/Kconfig

Simple merge