Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream

1 files changed, 0 insertions, 1 deletions

diff --git a/net/socket.c b/net/socket.c
index 2b7a4b5c9b72..57550c3bcabe 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -990,7 +990,6 @@ static int sock_close(struct inode *inode, struct file *filp)
                 printk(KERN_DEBUG "sock_close: NULL inode\n");
                 return 0;
         }
-        sock_fasync(-1, filp, 0);
         sock_release(SOCKET_I(inode));
         return 0;
 }