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.

1 files changed, 1 insertions, 1 deletions

diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c
index 5752f294751f..9527f2bb1744 100644
--- a/net/sunrpc/auth.c
+++ b/net/sunrpc/auth.c
@@ -213,7 +213,7 @@ retry:
                 rpcauth_gc_credcache(auth, &free);
         hlist_for_each_safe(pos, next, &cache->hashtable[nr]) {
                 struct rpc_cred *entry;
-                entry = hlist_entry(pos, struct rpc_cred, cr_hash);
+                entry = hlist_entry(pos, struct rpc_cred, cr_hash);
                 if (entry->cr_ops->crmatch(acred, entry, flags)) {
                         hlist_del(&entry->cr_hash);
                         cred = entry;