diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-12 21:39:21 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-12 21:39:21 +0100 |
commit | 6733e54b669c600eb8e451939ad55130db664fed (patch) | |
tree | 2a8c24c856fa3f5d7d58a3eb39da943ca1c57e65 /fs/nfs | |
parent | Merge tag 'to-linus' of git://github.com/rustyrussell/linux (diff) | |
parent | FUSE: Notifying the kernel of deletion. (diff) | |
download | linux-6733e54b669c600eb8e451939ad55130db664fed.tar.xz linux-6733e54b669c600eb8e451939ad55130db664fed.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
FUSE: Notifying the kernel of deletion.
fuse: support ioctl on directories
fuse: Use kcalloc instead of kzalloc to allocate array
fuse: llseek optimize SEEK_CUR and SEEK_SET
Diffstat (limited to 'fs/nfs')
0 files changed, 0 insertions, 0 deletions