From: Linus Torvalds 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-Url: http://git.efficios.com/?a=commitdiff_plain;h=162164f7e92da970666e7492fd58644f3c1f8574;p=deliverable%2Flinux.git 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 --- 162164f7e92da970666e7492fd58644f3c1f8574