linux/fs/afs
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
..
cache.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
callback.c fs/afs/callback.c should #include "cmservice.h" 2005-11-08 16:56:17 +01:00
cell.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
cell.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
cmservice.c [PATCH] fs: Use ARRAY_SIZE macro 2006-03-24 07:33:19 -08:00
cmservice.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
dir.c [PATCH] read_mapping_page for address space 2006-06-23 07:43:02 -07:00
errors.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
file.c [PATCH] Make address_space_operations->invalidatepage return void 2006-03-26 08:56:55 -08:00
fsclient.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
fsclient.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
inode.c [PATCH] afs: use generic_ro_fops 2005-11-07 07:53:41 -08:00
internal.h [PATCH] Make most file operations structs in fs/ const 2006-03-28 09:16:06 -08:00
kafsasyncd.c [PATCH] Cleanup patch for process freezing 2005-06-25 17:10:13 -07:00
kafsasyncd.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
kafstimod.c [PATCH] Cleanup patch for process freezing 2005-06-25 17:10:13 -07:00
kafstimod.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
main.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
misc.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
mntpt.c Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ 2006-06-24 13:07:53 -04:00
mount.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
proc.c [PATCH] Make most file operations structs in fs/ const 2006-03-28 09:16:06 -08:00
server.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
server.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
super.c Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ 2006-06-24 13:07:53 -04:00
super.h VFS: Unexport do_kern_mount() and clean up simple_pin_fs() 2006-06-09 09:34:16 -04:00
transport.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
types.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
vlclient.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
vlclient.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
vlocation.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
vnode.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
vnode.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
volume.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
volume.h [PATCH] afs: remove unnecessary __attribute__((packed)) 2006-01-08 20:14:07 -08:00