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.c

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

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

gss_generic_token.c

[NET] SUNRPC: Fix whitespace errors.

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

gss_krb5_crypto.c

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

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

gss_krb5_mech.c

SUNRPC: fix print format for tk_pid in auth_gss support

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

gss_krb5_seal.c

SUNRPC: fix print format for tk_pid in auth_gss support

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

gss_krb5_seqnum.c

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

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

gss_krb5_unseal.c

SUNRPC: fix print format for tk_pid in auth_gss support

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

gss_krb5_wrap.c

SUNRPC: fix print format for tk_pid in auth_gss support

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

gss_mech_switch.c

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

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

gss_spkm3_mech.c

SUNRPC: fix print format for tk_pid in auth_gss support

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

gss_spkm3_seal.c

SUNRPC: fix print format for tk_pid in auth_gss support

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

gss_spkm3_token.c

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

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

gss_spkm3_unseal.c

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

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

Makefile

RPCSEC_GSS: Add support for privacy to krb5 rpcsec_gss mechanism.

2005-10-18 23:19:46 -07:00

svcauth_gss.c

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

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