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
..
2005-04-16 15:20:36 -07:00
2006-10-20 10:26:40 -07:00
2006-12-08 08:28:47 -08:00
2006-12-13 09:05:52 -08:00
2006-12-13 09:05:52 -08:00