From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 5 Jun 2012 17:11:11 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f9ba7179ce91fb77b2adf6eaab3676ab3a1f5a15;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'for-linus' of git://git./linux/kernel/git/mszeredi/fuse

Pull fuse updates from Miklos Szeredi.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: fix blksize calculation
  fuse: fix stat call on 32 bit platforms
  fuse: optimize fallocate on permanent failure
  fuse: add FALLOCATE operation
  fuse: Convert to kstrtoul_from_user
---

f9ba7179ce91fb77b2adf6eaab3676ab3a1f5a15