diff --git a/[refs] b/[refs]
index 78016d97b1b6..5c1bfca92e00 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd0cbdd378258fdf44eac5ea091256a4a665315b
+refs/heads/master: 0fc4969b866671dfe39b1a9119d0fdc7ea0f63e5
diff --git a/trunk/kernel/irq/resend.c b/trunk/kernel/irq/resend.c
index 5bfeaed7e487..c38272746887 100644
--- a/trunk/kernel/irq/resend.c
+++ b/trunk/kernel/irq/resend.c
@@ -62,6 +62,15 @@ void check_irq_resend(struct irq_desc *desc, unsigned int irq)
 	 */
 	desc->chip->enable(irq);
 
+	/*
+	 * Temporary hack to figure out more about the problem, which
+	 * is causing the ancient network cards to die.
+	 */
+	if (desc->handle_irq != handle_edge_irq) {
+		WARN_ON_ONCE(1);
+		return;
+	}
+
 	if ((status & (IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {
 		desc->status = (status & ~IRQ_PENDING) | IRQ_REPLAY;