From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 29 Oct 2010 15:48:58 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
X-Git-Tag: v2.6.37-rc1~42
X-Git-Url: https://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=162164f7e92da970666e7492fd58644f3c1f8574

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
---

162164f7e92da970666e7492fd58644f3c1f8574