tree 28ebc44e789cebe7ec7b52ed74349438cf936eb2
parent bf25db365428dbd182768baa9850bef7afaac80d
parent 66048c381bb1e3a7c6fc69c28721843d6ec11c8c
author Linus Torvalds <torvalds@linux-foundation.org> 1281543613 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1281543613 -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: fix checkpatch.pl warnings
  Squashfs: fix filename typo
  Squashfs: update Kconfig and documentation for LZO
  Squashfs: fix block size use in LZO decompressor
  Squashfs: Add LZO compression support
  squashfs: fix filename in header comment
  Squashfs: Make XATTR config name consistent with other file systems
  squashfs: fix compiler inline warning