3.14 patch refresh

diff --git a/queue-3.14/stmmac-troubleshoot-unexpected-bits-in-des0-des1.patch b/queue-3.14/stmmac-troubleshoot-unexpected-bits-in-des0-des1.patch
index cdc823b334614f16b296b8135c4286886974d15b..d577dd4708f5737690acb0d0bd19c907f82a8d08 100644 (file)
--- a/queue-3.14/stmmac-troubleshoot-unexpected-bits-in-des0-des1.patch
+++ b/queue-3.14/stmmac-troubleshoot-unexpected-bits-in-des0-des1.patch
@@ -103,7 +103,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        else
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -1145,41 +1145,41 @@ static int alloc_dma_desc_resources(stru
+@@ -1142,41 +1142,41 @@ static int alloc_dma_desc_resources(stru
                goto err_tx_skbuff;
  
        if (priv->extend_desc) {