1
0
Fork 0
alistair23-linux/net/sunrpc
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
..
auth_gss SUNRPC: Dead code in net/sunrpc/auth_gss/auth_gss.c 2006-04-19 13:06:49 -04:00
Makefile [PATCH] RPC: introduce client-side transport switch 2005-09-23 12:38:12 -04:00
auth.c SUNRPC: Auto-load RPC authentication kernel modules 2006-03-20 13:44:08 -05:00
auth_null.c NFS: Display the chosen RPCSEC_GSS security flavour in /proc/mounts 2006-06-09 09:34:34 -04:00
auth_unix.c NFS: Display the chosen RPCSEC_GSS security flavour in /proc/mounts 2006-06-09 09:34:34 -04:00
cache.c [PATCH] knfsd: Fix two problems that can cause rmmod nfsd to die 2006-05-23 10:35:31 -07:00
clnt.c SUNRPC: Ensure rpc_call_async() always calls tk_ops->rpc_release() 2006-03-20 18:11:10 -05:00
pmap_clnt.c SUNRPC: eliminate rpc_call() 2006-03-20 13:44:23 -05:00
rpc_pipe.c Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ 2006-06-24 13:07:53 -04:00
sched.c [PATCH] mempool: use mempool_create_slab_pool() 2006-03-26 08:57:00 -08:00
socklib.c [NET]: Detect hardware rx checksum faults correctly 2005-11-10 13:01:24 -08:00
stats.c NFS: make 2 functions static 2006-04-19 12:43:47 -04:00
sunrpc_syms.c [PATCH] fs/nfsd/export.c,net/sunrpc/cache.c: make needlessly global code static 2006-03-27 08:44:43 -08:00
svc.c [NET]: Remove more unneeded typecasts on *malloc() 2006-01-11 16:32:14 -08:00
svcauth.c [PATCH] knfsd: Change the store of auth_domains to not be a 'cache' 2006-03-27 08:44:41 -08:00
svcauth_unix.c [PATCH] knfsd: Tidy up unix_domain_find 2006-03-27 08:44:43 -08:00
svcsock.c [NET]: sem2mutex part 2 2006-03-20 22:35:41 -08:00
sysctl.c SUNRPC: allow sunrpc.o to link when CONFIG_SYSCTL is disabled 2005-11-04 15:39:45 -05:00
timer.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
xdr.c RPC: Allow struc xdr_stream to read the page section of an xdr_buf 2006-06-09 09:34:21 -04:00
xprt.c SUNRPC: NFS_ROOT always uses the same XIDs 2006-06-09 09:34:06 -04:00
xprtsock.c SUNRPC: select privileged port numbers at random 2006-06-09 09:34:05 -04:00