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.

diff --cc fs/nfs/client.c
Simple merge

diff --cc fs/nfs/dir.c
Simple merge

diff --cc fs/nfs/nfs4_fs.h
Simple merge

diff --cc fs/nfs/nfs4proc.c
Simple merge

diff --cc fs/nfs/super.c
Simple merge

diff --cc include/linux/nfs_fs.h
Simple merge

diff --cc include/linux/nfs_xdr.h
Simple merge

diff --cc net/sunrpc/auth.c
Simple merge

diff --cc net/sunrpc/auth_gss/auth_gss.c
Simple merge

diff --cc net/sunrpc/auth_gss/gss_krb5_crypto.c
Simple merge

diff --cc net/sunrpc/auth_gss/gss_krb5_seqnum.c
Simple merge

diff --cc net/sunrpc/auth_gss/gss_mech_switch.c
Simple merge

diff --cc net/sunrpc/auth_gss/gss_spkm3_token.c
Simple merge

diff --cc net/sunrpc/auth_gss/gss_spkm3_unseal.c
Simple merge

diff --cc net/sunrpc/auth_gss/svcauth_gss.c
Simple merge

diff --cc net/sunrpc/cache.c
Simple merge

diff --cc net/sunrpc/clnt.c
Simple merge

diff --cc net/sunrpc/pmap_clnt.c
Simple merge

diff --cc net/sunrpc/rpc_pipe.c
Simple merge

diff --cc net/sunrpc/sched.c
Simple merge

diff --cc net/sunrpc/stats.c
Simple merge

diff --cc net/sunrpc/svc.c
Simple merge

diff --cc net/sunrpc/xprt.c
Simple merge