diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-11 12:20:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-11 12:20:13 -0400 |
| commit | 062e27ec1b49d12bdb1ecc94d74b5fee5a5775db (patch) | |
| tree | 28ebc44e789cebe7ec7b52ed74349438cf936eb2 /Documentation | |
| parent | bf25db365428dbd182768baa9850bef7afaac80d (diff) | |
| parent | 66048c381bb1e3a7c6fc69c28721843d6ec11c8c (diff) | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/filesystems/squashfs.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/filesystems/squashfs.txt b/Documentation/filesystems/squashfs.txt index 203f7202cc9e..66699afd66ca 100644 --- a/Documentation/filesystems/squashfs.txt +++ b/Documentation/filesystems/squashfs.txt | |||
| @@ -2,7 +2,7 @@ SQUASHFS 4.0 FILESYSTEM | |||
| 2 | ======================= | 2 | ======================= |
| 3 | 3 | ||
| 4 | Squashfs is a compressed read-only filesystem for Linux. | 4 | Squashfs is a compressed read-only filesystem for Linux. |
| 5 | It uses zlib compression to compress files, inodes and directories. | 5 | It uses zlib/lzo compression to compress files, inodes and directories. |
| 6 | Inodes in the system are very small and all blocks are packed to minimise | 6 | Inodes in the system are very small and all blocks are packed to minimise |
| 7 | data overhead. Block sizes greater than 4K are supported up to a maximum | 7 | data overhead. Block sizes greater than 4K are supported up to a maximum |
| 8 | of 1Mbytes (default block size 128K). | 8 | of 1Mbytes (default block size 128K). |