diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-07 16:18:36 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-07 16:18:36 -0400 |
commit | fe21ea18c742ab0eb8f6f8ebc543374839a02a87 (patch) | |
tree | ce34b75b8b522331425b9c151cdd1e71226e8d9a /fs/ioctl.c | |
parent | a57f9a3e811cf1246b394f0cc667c6bc5a52e099 (diff) | |
parent | 2d45ba381a74a743eeaa2b06c7c5c0d2bf73ba1a (diff) |
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: add retrieve request
fuse: add store request
fuse: don't use atomic kmap
Diffstat (limited to 'fs/ioctl.c')
0 files changed, 0 insertions, 0 deletions