From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 1 Oct 2015 04:23:50 +0000 (+0200)
Subject: 3.14 patch refresh
X-Git-Tag: v3.14.54~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6719bf45ee0648bfb246ebffdcc9e3090d05d8a7;p=thirdparty%2Fkernel%2Fstable-queue.git

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 cdc823b3346..d577dd4708f 100644
--- 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) {