android_kernel_xiaomi_sm8350/fs/lockd
Trond Myklebust d9bc125caf Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:

	net/sunrpc/auth_gss/gss_krb5_crypto.c
	net/sunrpc/auth_gss/gss_spkm3_token.c
	net/sunrpc/clnt.c

Merge with mainline and fix conflicts.
2007-02-12 22:43:25 -08:00
..
clntlock.c [PATCH] fs/lockd/clntlock.c: add missing newlines to dprintk's 2007-01-30 08:26:45 -08:00
clntproc.c NLM: Fix double free in __nlm_async_call 2007-02-03 15:35:02 -08:00
host.c [PATCH] knfsd: SUNRPC: Provide room in svc_rqst for larger addresses 2007-02-12 09:48:36 -08:00
Makefile
mon.c
svc4proc.c [PATCH] knfsd: SUNRPC: Provide room in svc_rqst for larger addresses 2007-02-12 09:48:36 -08:00
svc.c [PATCH] knfsd: SUNRPC: Add a function to format the address in an svc_rqst for printing 2007-02-12 09:48:35 -08:00
svclock.c NLM: Fix double free in __nlm_async_call 2007-02-03 15:35:02 -08:00
svcproc.c [PATCH] knfsd: SUNRPC: Provide room in svc_rqst for larger addresses 2007-02-12 09:48:36 -08:00
svcshare.c [PATCH] getting rid of all casts of k[cmz]alloc() calls 2006-12-13 09:05:58 -08:00
svcsubs.c
xdr4.c [PATCH] lockd endianness annotations 2006-12-13 09:05:52 -08:00
xdr.c [PATCH] lockd endianness annotations 2006-12-13 09:05:52 -08:00