Trond Myklebust 816724e65c Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ ...

Conflicts:

	fs/nfs/inode.c
	fs/super.c

Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'

2006-06-24 13:07:53 -04:00

..

dev.c

[fuse] fix deadlock between fuse_put_super() and request_end(), try #2

2006-04-26 10:49:06 +02:00

dir.c

[PATCH] fuse: clean up request accounting

2006-04-11 06:18:49 -07:00

file.c

[PATCH] vfs: add lock owner argument to flush operation

2006-06-23 07:43:02 -07:00

fuse_i.h

Revert "[fuse] fix deadlock between fuse_put_super() and request_end()"

2006-04-26 10:48:55 +02:00

inode.c

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

2006-06-24 13:07:53 -04:00

Makefile

[PATCH] FUSE - file operations

2005-09-09 14:03:45 -07:00