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, 5 deletions

diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index ada4605d1223..6543a5547c84 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -1995,11 +1995,6 @@ pfm_close(struct inode *inode, struct file *filp)
                 return -EBADF;
         }
 
-        if (filp->f_flags & FASYNC) {
-                DPRINT(("cleaning up async_queue=%p\n", ctx->ctx_async_queue));
-                pfm_do_fasync(-1, filp, ctx, 0);
-        }
-
         PROTECT_CTX(ctx, flags);
 
         state     = ctx->ctx_state;