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

Conflicts:
	drivers/net/smsc911x.c

1 files changed, 1 insertions, 1 deletions

diff --git a/include/net/sock.h b/include/net/sock.h
index 9cbf23c815f5..f2046e404a61 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1803,7 +1803,7 @@ void sock_net_set(struct sock *sk, struct net *net)
 
 /*
  * Kernel sockets, f.e. rtnl or icmp_socket, are a part of a namespace.
- * They should not hold a referrence to a namespace in order to allow
+ * They should not hold a reference to a namespace in order to allow
  * to stop it.
  * Sockets after sk_change_net should be released using sk_release_kernel
  */