Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Oct 2010 15:48:58 +0000 (08:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Oct 2010 15:48:58 +0000 (08:48 -0700)
commit162164f7e92da970666e7492fd58644f3c1f8574
treec69448e73d24bf83cd412c04d525eb541a84cdc0
parentd8d048f69a618c531575cb1f398a7186f0532ef2
parent5f3b321da1aa5936c85ed6dec67358239a9d3cfd
Merge git://git./linux/kernel/git/pkl/squashfs-linus

* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus:
  Squashfs: fix function prototype
  Squashfs: fix use of __le64 annotated variable