]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commite10c664fec21d44f9bed689f1d565ef1c399cd5d
tree5faee830194d778a9bb63317bc6ff7f8962a976b
parentcaee391316757ada214ae1978ab3b9f8f7af58b7
parent7383b1c446fbfb456291f246bb8cc85148027a79
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
fs/squashfs/Kconfig