From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 4 Nov 2011 23:48:37 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next
X-Git-Tag: v3.2-rc1~50
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=044595d4e448305fbaec472eb7d22636d24e7d8c

Merge git://git./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
---

044595d4e448305fbaec472eb7d22636d24e7d8c