projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1583171 7657cac)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next
authorLinus Torvalds <[email protected]>
Fri, 4 Nov 2011 23:48:37 +0000 (16:48 -0700)
committerLinus Torvalds <[email protected]>
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 patch | diff1 | diff2 | blob | history

diff --cc fs/squashfs/Kconfig
Simple merge
John Crispins staging tree