Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 May 2009 23:33:25 +0000 (16:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 May 2009 23:33:25 +0000 (16:33 -0700)
commit210af919c949a7d6bd330916ef376cec2907d81e
treeb2d66ca5d30b807cc8a55bbc524e85406888b66c
parenta6aeeebf5179ea6346249d727bdb9124ce9e2d4c
parente5d287539dba264a1d9d7607a25b8c8c61c9d658
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