David S. Miller 69259abb64 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/pcmcia/pcnet_cs.c net/caif/caif_socket.c		2010-10-06 19:39:31 -07:00
..
Makefile	gss_krb5: import functionality to derive keys into the kernel	2010-05-14 15:09:16 -04:00
auth_gss.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-10-06 19:39:31 -07:00
gss_generic_token.c	net: return operator cleanup	2010-09-23 14:33:39 -07:00
gss_krb5_crypto.c	gss_krb5: Add support for rc4-hmac encryption	2010-05-14 15:09:20 -04:00
gss_krb5_keys.c	NFS: Don't use GFP_KERNEL in rpcsec_gss downcalls	2010-05-14 15:09:33 -04:00
gss_krb5_mech.c	gss:krb5 miss returning error to caller when import security context	2010-09-12 19:55:25 -04:00
gss_krb5_seal.c	gss_krb5: Add support for rc4-hmac encryption	2010-05-14 15:09:20 -04:00
gss_krb5_seqnum.c	net: return operator cleanup	2010-09-23 14:33:39 -07:00
gss_krb5_unseal.c	gss_krb5: Add support for rc4-hmac encryption	2010-05-14 15:09:20 -04:00
gss_krb5_wrap.c	gss_krb5: Add support for rc4-hmac encryption	2010-05-14 15:09:20 -04:00
gss_mech_switch.c	net: return operator cleanup	2010-09-23 14:33:39 -07:00
gss_spkm3_mech.c	gss:spkm3 miss returning error to caller when import security context	2010-09-12 19:55:26 -04:00
gss_spkm3_seal.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
gss_spkm3_token.c	net: remove trailing space in messages	2010-03-24 14:01:54 -07:00
gss_spkm3_unseal.c	Merge branch 'master' of /home/trondmy/kernel/linux-2.6/	2007-02-12 22:43:25 -08:00
svcauth_gss.c	NFS: Don't use GFP_KERNEL in rpcsec_gss downcalls	2010-05-14 15:09:33 -04:00