| commit | b24bc1e61cec2174faf5dfa632da16b6ca17144f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 05 10:46:04 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 05 10:46:04 2010 -0800 |
| tree | 33abe2345c70d4bce31cda8fe2e562a8a9a24dfc | |
| parent | 64ba9926759792cf7b95f823402e2781edd1b5d4 [diff] | |
| parent | 06862f884d9c2453daaf0c1d070c69cf444f10b1 [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: get rid of obsolete definition in header file Squashfs: get rid of obsolete variable in struct squashfs_sb_info Squashfs: add decompressor entries for lzma and lzo Squashfs: add a decompressor framework Squashfs: factor out remaining zlib dependencies into separate wrapper file Squashfs: move zlib decompression wrapper code into a separate file