Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Aug 2010 16:20:13 +0000 (09:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Aug 2010 16:20:13 +0000 (09:20 -0700)
commit062e27ec1b49d12bdb1ecc94d74b5fee5a5775db
tree28ebc44e789cebe7ec7b52ed74349438cf936eb2
parentbf25db365428dbd182768baa9850bef7afaac80d
parent66048c381bb1e3a7c6fc69c28721843d6ec11c8c
Merge git://git./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