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

…

gss_generic_token.c

…

gss_krb5_crypto.c

…

gss_krb5_mech.c

…

gss_krb5_seal.c

…

gss_krb5_seqnum.c

…

gss_krb5_unseal.c

…

gss_krb5_wrap.c

…

gss_mech_switch.c

…

gss_spkm3_mech.c

…

gss_spkm3_seal.c

…

gss_spkm3_token.c

…

gss_spkm3_unseal.c

…

Makefile

…

svcauth_gss.c

…