projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 64ba992 06862f8)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Mar 2010 18:46:04 +0000 (10:46 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Mar 2010 18:46:04 +0000 (10:46 -0800)
commitb24bc1e61cec2174faf5dfa632da16b6ca17144f
tree33abe2345c70d4bce31cda8fe2e562a8a9a24dfctree | snapshot
parent64ba9926759792cf7b95f823402e2781edd1b5d4commit | diff
parent06862f884d9c2453daaf0c1d070c69cf444f10b1commit | diff
Merge git://git./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
John Crispins staging tree