]> 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)
commit1bac4f48a6418895b3070fa0c46b6692080142e5
tree5faee830194d778a9bb63317bc6ff7f8962a976b
parent2e50e3c50912ca0990ac52a5867714bf1f6d45dd
parentcfad6602f6d82cf716f0e4f194deec24ad5173b5
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