Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c

2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/stmmac/gmac.c b/drivers/net/stmmac/gmac.c
index b624bb5bae0..52586ee6895 100644
--- a/drivers/net/stmmac/gmac.c
+++ b/drivers/net/stmmac/gmac.c
@@ -112,7 +112,7 @@ static void gmac_dma_operation_mode(unsigned long ioaddr, int txmode,
                               " (threshold = %d)\n", txmode);
                 csr6 &= ~DMA_CONTROL_TSF;
                 csr6 &= DMA_CONTROL_TC_TX_MASK;
-                /* Set the transmit threashold */
+                /* Set the transmit threshold */
                 if (txmode <= 32)
                         csr6 |= DMA_CONTROL_TTC_32;
                 else if (txmode <= 64)
diff --git a/drivers/net/stmmac/gmac.h b/drivers/net/stmmac/gmac.h
index 684a363120a..2e82d6c9a14 100644
--- a/drivers/net/stmmac/gmac.h
+++ b/drivers/net/stmmac/gmac.h
@@ -154,14 +154,14 @@ enum rx_tx_priority_ratio {
 #define DMA_CONTROL_DT          0x04000000 /* Disable Drop TCP/IP csum error */
 #define DMA_CONTROL_RSF         0x02000000 /* Receive Store and Forward */
 #define DMA_CONTROL_DFF         0x01000000 /* Disaable flushing */
-/* Theshold for Activating the FC */
+/* Threshold for Activating the FC */
 enum rfa {
         act_full_minus_1 = 0x00800000,
         act_full_minus_2 = 0x00800200,
         act_full_minus_3 = 0x00800400,
         act_full_minus_4 = 0x00800600,
 };
-/* Theshold for Deactivating the FC */
+/* Threshold for Deactivating the FC */
 enum rfd {
         deac_full_minus_1 = 0x00400000,
         deac_full_minus_2 = 0x00400800,