projects / platform / upstream / kernel-adaptation-pc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0b3e9f3 203627b)
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)
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

1  2 
fs/fuse/file.c patch | diff1 | diff2 | blob | history
fs/fuse/inode.c patch | diff1 | diff2 | blob | history

diff --cc fs/fuse/file.c
Simple merge
diff --cc fs/fuse/inode.c
Simple merge
Domain: System / Uncategorized;