forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:

	drivers/net/ppp_generic.c
This commit is contained in:
David S. Miller 2008-12-23 17:56:23 -08:00
commit 6332178d91
8 changed files with 29 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

1
net/socket.c
View file

@ -2306,6 +2306,7 @@ int kernel_accept(struct socket *sock, struct socket **newsock, int flags)
}
(*newsock)->ops = sock->ops;
__module_get((*newsock)->ops->owner);
done:
return err;