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

Conflicts:

	drivers/net/wireless/ath5k/base.c
	net/8021q/vlan_core.c

1 files changed, 0 insertions, 1 deletions

diff --git a/net/socket.c b/net/socket.c
index d23cdba10d7e..d7128b761c8c 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -989,7 +989,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;
 }