kevin/linux
1
Fork 0
Code
816724e65c
linux/fs/9p
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
..
9p.h [PATCH] v9fs: update license boilerplate 2006-03-25 08:22:54 -08:00
conv.c [PATCH] v9fs: update license boilerplate 2006-03-25 08:22:54 -08:00
conv.h [PATCH] v9fs: update license boilerplate 2006-03-25 08:22:54 -08:00
debug.h [PATCH] v9fs: update license boilerplate 2006-03-25 08:22:54 -08:00
error.c [PATCH] v9fs: update license boilerplate 2006-03-25 08:22:54 -08:00
error.h [PATCH] v9fs: update license boilerplate 2006-03-25 08:22:54 -08:00
fcall.c [PATCH] v9fs: Twalk memory leak 2006-05-15 11:20:56 -07:00
fcprint.c [PATCH] v9fs: update license boilerplate 2006-03-25 08:22:54 -08:00
fid.c [PATCH] v9fs: update license boilerplate 2006-03-25 08:22:54 -08:00
fid.h [PATCH] v9fs: update license boilerplate 2006-03-25 08:22:54 -08:00
Makefile [PATCH] 9p: fix name consistency problems 2006-03-25 08:22:54 -08:00
mux.c [PATCH] v9fs: signal handling fixes 2006-05-15 11:20:56 -07:00
mux.h [PATCH] v9fs: signal handling fixes 2006-05-15 11:20:56 -07:00
trans_fd.c [PATCH] v9fs: update license boilerplate 2006-03-25 08:22:54 -08:00
transport.h [PATCH] v9fs: update license boilerplate 2006-03-25 08:22:54 -08:00
v9fs_vfs.h [PATCH] Make most file operations structs in fs/ const 2006-03-28 09:16:06 -08:00
v9fs.c [PATCH] 9p: fix name consistency problems 2006-03-25 08:22:54 -08:00
v9fs.h [PATCH] v9fs: update license boilerplate 2006-03-25 08:22:54 -08:00
vfs_addr.c [PATCH] v9fs: update license boilerplate 2006-03-25 08:22:54 -08:00
vfs_dentry.c [PATCH] v9fs: update license boilerplate 2006-03-25 08:22:54 -08:00
vfs_dir.c [PATCH] Make most file operations structs in fs/ const 2006-03-28 09:16:06 -08:00
vfs_file.c [PATCH] v9fs: signal handling fixes 2006-05-15 11:20:56 -07:00
vfs_inode.c [PATCH] v9fs: signal handling fixes 2006-05-15 11:20:56 -07:00
vfs_super.c Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ 2006-06-24 13:07:53 -04:00