David S. Miller 577f99c1d0 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:

	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/8021q/vlan_dev.c

2008-03-18 00:37:55 -07:00

..

auth_gss.c

net: replace remaining __FUNCTION__ occurrences

2008-03-05 20:47:47 -08:00

gss_generic_token.c

…

gss_krb5_crypto.c

[SG] Get rid of __sg_mark_end()

2007-11-02 08:47:06 +01:00

gss_krb5_mech.c

sunrpc: return error if unsupported enctype or cksumtype is encountered

2007-11-17 13:08:46 -05:00

gss_krb5_seal.c

sunrpc: return error if unsupported enctype or cksumtype is encountered

2007-11-17 13:08:46 -05:00

gss_krb5_seqnum.c

…

gss_krb5_unseal.c

…

gss_krb5_wrap.c

cleanup asm/scatterlist.h includes

2007-11-02 08:47:06 +01:00

gss_mech_switch.c

[SUNRPC]: net/* NULL noise

2008-03-17 22:48:03 -07:00

gss_spkm3_mech.c

knfsd: rpc: add gss krb5 and spkm3 oid values

2007-07-17 10:23:08 -07:00

gss_spkm3_seal.c

[CRYPTO] users: Fix up scatterlist conversion errors

2007-10-27 00:52:07 -07:00

gss_spkm3_token.c

…

gss_spkm3_unseal.c

…

Makefile

…

svcauth_gss.c

svcrpc: ensure gss DESTROY tokens free contexts from cache

2008-02-01 16:42:07 -05:00