1
0
Fork 0
alistair23-linux/fs/configfs
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
..
Makefile [PATCH] configfs: User-driven configuration filesystem 2006-01-03 11:45:28 -08:00
configfs_internal.h [PATCH] Make most file operations structs in fs/ const 2006-03-28 09:16:06 -08:00
dir.c configfs: configfs_mkdir() failed to cleanup linkage. 2006-05-17 14:38:51 -07:00
file.c [PATCH] Make most file operations structs in fs/ const 2006-03-28 09:16:06 -08:00
inode.c [PATCH] BUG_ON() Conversion in fs/configfs/ 2006-02-03 14:03:09 -08:00
item.c [PATCH] configfs: User-driven configuration filesystem 2006-01-03 11:45:28 -08:00
mount.c Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ 2006-06-24 13:07:53 -04:00
symlink.c [PATCH] BUG_ON() Conversion in fs/configfs/ 2006-02-03 14:03:09 -08:00