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

diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c
index a9604764e015..6fb2e9d716c0 100644
--- a/net/ipv6/anycast.c
+++ b/net/ipv6/anycast.c
@@ -1,6 +1,6 @@
 /*
  *      Anycast support for IPv6
- *      Linux INET6 implementation 
+ *      Linux INET6 implementation
  *
  *      Authors:
  *      David L Stevens (dlstevens@us.ibm.com)
@@ -397,7 +397,7 @@ static int ipv6_dev_ac_dec(struct net_device *dev, struct in6_addr *addr)
         in6_dev_put(idev);
         return ret;
 }
-        
+
 /*
  *      check if the interface has this anycast address
  */
@@ -565,7 +565,7 @@ out_kfree:
         goto out;
 }
 
-static struct file_operations ac6_seq_fops = {
+static const struct file_operations ac6_seq_fops = {
         .owner          =       THIS_MODULE,
         .open           =       ac6_seq_open,
         .read           =       seq_read,