Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/8021q/vlan_dev.c

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/sparc/kernel/sys_sunos.c b/arch/sparc/kernel/sys_sunos.c
index 28c187c5d9fd..f5b608bbe8af 100644
--- a/arch/sparc/kernel/sys_sunos.c
+++ b/arch/sparc/kernel/sys_sunos.c
@@ -659,7 +659,7 @@ sunos_nfs_get_server_fd (int fd, struct sockaddr_in *addr)
 
         socket = SOCKET_I(inode);
         local.sin_family = AF_INET;
-        local.sin_addr.s_addr = INADDR_ANY;
+        local.sin_addr.s_addr = htonl(INADDR_ANY);
 
         /* IPPORT_RESERVED = 1024, can't find the definition in the kernel */
         try_port = 1024;