Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/spi/au1550_spi.c b/drivers/spi/au1550_spi.c
index 3c9ade69643f..b50563d320e1 100644
--- a/drivers/spi/au1550_spi.c
+++ b/drivers/spi/au1550_spi.c
@@ -480,7 +480,7 @@ static irqreturn_t au1550_spi_dma_irq_callback(struct au1550_spi *hw)
                 au1xxx_dbdma_stop(hw->dma_rx_ch);
                 au1xxx_dbdma_stop(hw->dma_tx_ch);
 
-                /* get number of transfered bytes */
+                /* get number of transferred bytes */
                 hw->rx_count = hw->len - au1xxx_get_dma_residue(hw->dma_rx_ch);
                 hw->tx_count = hw->len - au1xxx_get_dma_residue(hw->dma_tx_ch);