diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 22:44:25 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 22:44:25 +0200 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /include/net/sock.h | |
| parent | niu: Recognise original ethtool class code for AH/ESP flow hashing (diff) | |
| parent | caif: performance bugfix - allow radio stack to prioritize packets. (diff) | |
| download | linux-1c01a80cfec6f806246f31ff2680cd3639b30e67.tar.xz linux-1c01a80cfec6f806246f31ff2680cd3639b30e67.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'include/net/sock.h')
| -rw-r--r-- | include/net/sock.h | 2 |
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 */ |