Skip to content
Commit d9bc125c authored by Trond Myklebust's avatar Trond Myklebust
Browse files

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.
parents 43d78ef2 ec2f9d13
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment