Linux

mirror of https://github.com/torvalds/linux.git synced 2026-09-15 15:01:08 -04:00

Files

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

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

gss_generic_token.c

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

gss_krb5_crypto.c

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

gss_krb5_mech.c

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

gss_krb5_seal.c

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

gss_krb5_seqnum.c

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

gss_krb5_unseal.c

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

gss_krb5_wrap.c

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

gss_mech_switch.c

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

gss_spkm3_mech.c

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

gss_spkm3_seal.c

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

gss_spkm3_token.c

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

gss_spkm3_unseal.c

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

Makefile

…

svcauth_gss.c

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