tree c69448e73d24bf83cd412c04d525eb541a84cdc0
parent d8d048f69a618c531575cb1f398a7186f0532ef2
parent 5f3b321da1aa5936c85ed6dec67358239a9d3cfd
author Linus Torvalds <torvalds@linux-foundation.org> 1288367338 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1288367338 -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 function prototype
  Squashfs: fix use of __le64 annotated variable