]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge tag 'squashfs-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squas...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Dec 2013 16:54:00 +0000 (08:54 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Dec 2013 16:54:00 +0000 (08:54 -0800)
commit278717909d47d86fbb20ab66dfeaa84560a2f8f2
tree7de925d78f769331d0ccfb6ce4c10c58c2198ea6
parentd644c026e6b21959af1f86b15206ae26c64c2e51
parent6d565409503f4e1f74ac30de14e8c91a2b826cd8
Merge tag 'squashfs-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next

Pull squashfs bugfix from Phillip Lougher:
 "Just a single bug fix to the new "directly decompress into the page
  cache" code"

* tag 'squashfs-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next:
  Squashfs: fix failure to unlock pages on decompress error