Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Jun 2012 17:11:11 +0000 (10:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Jun 2012 17:11:11 +0000 (10:11 -0700)
commitf9ba7179ce91fb77b2adf6eaab3676ab3a1f5a15
tree2d02e7a4fd78083b78749d0c9c7466f0eb8e6f97
parent0b3e9f3f21c42d064f5f4088df4088e3d55755eb
parent203627bbc90377c509e32450c67c5d957ba2d989
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
fs/fuse/file.c
fs/fuse/inode.c