tree 026c1fe1d01a16724c8fff538b1fe29bbf1ef06b
parent 93a9248af27aa83c08910d3e38b584678b1dc534
parent e0d1f70010dce062ccce1bbd940a661e60b82631
author Linus Torvalds <torvalds@linux-foundation.org> 1272383978 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1272383978 -0700

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