]> err.no Git - linux-2.6/commitdiff
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)
* '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()


Trivial merge