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

..

auth_gss

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

2007-02-12 22:43:25 -08:00

auth_null.c

[SUNRPC]: trivial endianness annotations

2006-09-28 18:01:21 -07:00

auth_unix.c

SUNRPC: fix print format for tk_pid

2007-02-03 15:35:10 -08:00

auth.c

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

2007-02-12 22:43:25 -08:00

cache.c

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

2007-02-12 22:43:25 -08:00

clnt.c

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

2007-02-12 22:43:25 -08:00

Makefile

[PATCH] RPC: introduce client-side transport switch

2005-09-23 12:38:12 -04:00

pmap_clnt.c

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

2007-02-12 22:43:25 -08:00

rpc_pipe.c

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

2007-02-12 22:43:25 -08:00

sched.c

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

2007-02-12 22:43:25 -08:00

socklib.c

SUNRPC: Rename skb_reader_t and friends

2006-12-06 10:46:52 -05:00

stats.c

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

2007-02-12 22:43:25 -08:00

sunrpc_syms.c

SUNRPC: create stubs for xprtsock init and cleanup

2006-12-06 10:46:53 -05:00

svc.c

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

2007-02-12 22:43:25 -08:00

svcauth_unix.c

[PATCH] knfsd: SUNRPC: Provide room in svc_rqst for larger addresses

2007-02-12 09:48:36 -08:00

svcauth.c

[NET] SUNRPC: Fix whitespace errors.

2007-02-10 23:20:13 -08:00

svcsock.c

[PATCH] knfsd: SUNRPC: fix up svc_create_socket() to take a sockaddr struct + length

2007-02-12 09:48:36 -08:00

sysctl.c

[NET] SUNRPC: Fix whitespace errors.

2007-02-10 23:20:13 -08:00

timer.c

SUNRPC: remove extraneous header inclusions

2006-09-22 23:24:47 -04:00

xdr.c

[NET] SUNRPC: Fix whitespace errors.

2007-02-10 23:20:13 -08:00

xprt.c

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

2007-02-12 22:43:25 -08:00

xprtsock.c

SUNRPC: fix print format for tk_pid

2007-02-03 15:35:10 -08:00