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

Conflicts:

	drivers/net/ppp_generic.c

1 files changed, 1 insertions, 0 deletions

diff --git a/net/socket.c b/net/socket.c
index e9d65ea2687e..43021f9463f3 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -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;