lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Conflicts:
	drivers/net/smsc911x.c
This commit is contained in:
David S. Miller
2011-04-11 13:44:25 -07:00
parent c44d79950b 4a9f65f630
commit 1c01a80cfe
2765 changed files with 7223 additions and 8041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv4/raw.c
View File

@@ -618,7 +618,7 @@ do_confirm:
static void raw_close(struct sock *sk, long timeout)
{
/*
* Raw sockets may have direct kernel refereneces. Kill them.
* Raw sockets may have direct kernel references. Kill them.
*/
ip_ra_control(sk, 0, NULL);