| commit | bc113f151a73cb2195c2fb40d7d70acf8e2f9208 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 27 08:59:38 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 27 08:59:38 2010 -0700 |
| tree | 026c1fe1d01a16724c8fff538b1fe29bbf1ef06b | |
| parent | 93a9248af27aa83c08910d3e38b584678b1dc534 [diff] | |
| parent | e0d1f70010dce062ccce1bbd940a661e60b82631 [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 potential buffer over-run on 4K block file systems squashfs: add missing buffer free squashfs: fix warn_on when root inode is corrupted squashfs: fix locking bug in zlib wrapper