From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 13 May 2009 23:33:25 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
X-Git-Tag: v2.6.30-rc6~16
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=210af919c949a7d6bd330916ef376cec2907d81e

Merge git://git./linux/kernel/git/pkl/squashfs-linus

* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus:
  Squashfs: cody tidying, remove commented out line in Makefile
  Squashfs: check page size is not larger than the filesystem block size
  Squashfs: fix breakage when page size > metadata block size
---

210af919c949a7d6bd330916ef376cec2907d81e