]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Apr 2010 15:59:38 +0000 (08:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Apr 2010 15:59:38 +0000 (08:59 -0700)
commitbc113f151a73cb2195c2fb40d7d70acf8e2f9208
tree026c1fe1d01a16724c8fff538b1fe29bbf1ef06b
parent93a9248af27aa83c08910d3e38b584678b1dc534
parente0d1f70010dce062ccce1bbd940a661e60b82631
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