tree b2d66ca5d30b807cc8a55bbc524e85406888b66c
parent a6aeeebf5179ea6346249d727bdb9124ce9e2d4c
parent e5d287539dba264a1d9d7607a25b8c8c61c9d658
author Linus Torvalds <torvalds@linux-foundation.org> 1242257605 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1242257605 -0700

Merge git://git.kernel.org/pub/scm/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