davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
816724e65c
kernel-ark/fs/nfs
History
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
..
callback_proc.c
callback_xdr.c
callback.c NFS: Split fs/nfs/inode.c 2006-06-09 09:34:33 -04:00
callback.h
delegation.c
delegation.h
dir.c
direct.c NFS: Split fs/nfs/inode.c 2006-06-09 09:34:33 -04:00
file.c Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ 2006-06-24 13:07:53 -04:00
idmap.c
inode.c [PATCH] VFS: Permit filesystem to perform statfs with a known root dentry 2006-06-23 07:42:45 -07:00
internal.h NFS: Split fs/nfs/inode.c 2006-06-09 09:34:33 -04:00
iostat.h
Makefile NFS: Split fs/nfs/inode.c 2006-06-09 09:34:33 -04:00
mount_clnt.c
namespace.c NFS: Split fs/nfs/inode.c 2006-06-09 09:34:33 -04:00
nfs2xdr.c Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ 2006-06-24 13:07:53 -04:00
nfs3acl.c
nfs3proc.c NFS: Split fs/nfs/inode.c 2006-06-09 09:34:33 -04:00
nfs3xdr.c NFS: Split fs/nfs/inode.c 2006-06-09 09:34:33 -04:00
nfs4_fs.h NFSv4: Define an fs_locations bitmap 2006-06-09 09:34:25 -04:00
nfs4namespace.c NFS: Split fs/nfs/inode.c 2006-06-09 09:34:33 -04:00
nfs4proc.c NFS: Split fs/nfs/inode.c 2006-06-09 09:34:33 -04:00
nfs4renewd.c
nfs4state.c
nfs4xdr.c NFSv4: A root pathname is sent as a zero component4 2006-06-09 09:34:30 -04:00
nfsroot.c
pagelist.c NFS: Split fs/nfs/inode.c 2006-06-09 09:34:33 -04:00
proc.c NFS: Split fs/nfs/inode.c 2006-06-09 09:34:33 -04:00
read.c NFS: Split fs/nfs/inode.c 2006-06-09 09:34:33 -04:00
super.c Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ 2006-06-24 13:07:53 -04:00
symlink.c
sysctl.c
unlink.c
write.c NFS: Split fs/nfs/inode.c 2006-06-09 09:34:33 -04:00