| commit | 9a7e9f1c60bada782014b2f422f6c68c4d5388f3 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Fri Apr 14 09:11:34 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Fri Apr 14 09:11:34 2006 -0700 |
| tree | 7e874364f448e050edd6058c50e1e70346b99696 | |
| parent | 9ca686626c012935b3b8219815e9027facc6fe6e [diff] | |
| parent | 56cf34ff0795692327234963dcdcc2cdeec2bb3d [diff] |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/mszeredi/fuse * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/mszeredi/fuse: [fuse] Direct I/O should not use fuse_reset_request [fuse] Don't init request twice [fuse] Fix accounting the number of waiting requests [fuse] fix deadlock between fuse_put_super() and request_end()