diff --git a/[refs] b/[refs]
index 1179727d742e..3fb33f866d32 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b8249e759c701c4a82f99d957be651a7657bf6f
+refs/heads/master: 2b879eaf095878430c38cbd95e5c0fc4ce65ad8e
diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c
index dc95d53df510..33a6ee0ac68f 100644
--- a/trunk/kernel/irq/manage.c
+++ b/trunk/kernel/irq/manage.c
@@ -309,8 +309,6 @@ int irq_select_affinity_usr(unsigned int irq, struct cpumask *mask)
 
 	raw_spin_lock_irqsave(&desc->lock, flags);
 	ret = setup_affinity(irq, desc, mask);
-	if (!ret)
-		irq_set_thread_affinity(desc);
 	raw_spin_unlock_irqrestore(&desc->lock, flags);
 	return ret;
 }