projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9ca6866 56cf34f)
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/mszeredi...
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 14 Apr 2006 16:11:34 +0000 (09:11 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 14 Apr 2006 16:11:34 +0000 (09:11 -0700)
commit9a7e9f1c60bada782014b2f422f6c68c4d5388f3
tree7e874364f448e050edd6058c50e1e70346b99696tree | snapshot
parent9ca686626c012935b3b8219815e9027facc6fe6ecommit | diff
parent56cf34ff0795692327234963dcdcc2cdeec2bb3dcommit | diff
Merge branch 'for-linus' of /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()
John Crispins staging tree