summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-04-14 09:11:34 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-14 09:11:34 -0700
commit9a7e9f1c60bada782014b2f422f6c68c4d5388f3 (patch)
tree7e874364f448e050edd6058c50e1e70346b99696 /scripts
parent9ca686626c012935b3b8219815e9027facc6fe6e (diff)
parent56cf34ff0795692327234963dcdcc2cdeec2bb3d (diff)
downloadlinux-9a7e9f1c60bada782014b2f422f6c68c4d5388f3.tar.bz2
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()
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions