diff --git a/[refs] b/[refs]
index 474aa09423eb..ea99f62c4f40 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1cc68ae0cf9e3384d9eef6985b312bf2bf1161b3
+refs/heads/master: 400de2c0c4f4a2cc2e0270353e7eb512c1899a0c
diff --git a/trunk/drivers/net/fealnx.c b/trunk/drivers/net/fealnx.c
index d05e9dd1e140..9e0303f6d73c 100644
--- a/trunk/drivers/net/fealnx.c
+++ b/trunk/drivers/net/fealnx.c
@@ -1423,8 +1423,7 @@ static void reset_tx_descriptors(struct net_device *dev)
 		if (cur->skbuff) {
 			pci_unmap_single(np->pci_dev, cur->buffer,
 				cur->skbuff->len, PCI_DMA_TODEVICE);
-			dev_kfree_skb(cur->skbuff);
-			/* or dev_kfree_skb_irq(cur->skbuff); ? */
+			dev_kfree_skb_any(cur->skbuff);
 			cur->skbuff = NULL;
 		}
 		cur->status = 0;