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, 2 insertions, 2 deletions

diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 115c8120ff13..10c26ed0db71 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -767,8 +767,8 @@ struct nfs_access_entry;
 struct nfs_rpc_ops {
         int     version;                /* Protocol version */
         struct dentry_operations *dentry_ops;
-        struct inode_operations *dir_inode_ops;
-        struct inode_operations *file_inode_ops;
+        const struct inode_operations *dir_inode_ops;
+        const struct inode_operations *file_inode_ops;
 
         int     (*getroot) (struct nfs_server *, struct nfs_fh *,
                             struct nfs_fsinfo *);