tree 263b7066ba22ddce21db610c0300f6eaac6f2064
parent 43d78ef2ba5bec26d0315859e8324bfc0be23766
parent ec2f9d1331f658433411c58077871e1eef4ee1b4
author Trond Myklebust <Trond.Myklebust@netapp.com> 1171349005 -0800
committer Trond Myklebust <Trond.Myklebust@netapp.com> 1171349005 -0800

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.