ASoC: Merge branch 'for-2.6.39' into for-2.6.40

Fix trivial conflict caused by silly spelling fix patch.

Conflicts:
	sound/soc/codecs/wm8994.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 57731e870085..6deee4e546be 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -520,7 +520,7 @@ static bool pl011_dma_tx_irq(struct uart_amba_port *uap)
 
         /*
          * We don't have a TX buffer queued, so try to queue one.
-         * If we succesfully queued a buffer, mask the TX IRQ.
+         * If we successfully queued a buffer, mask the TX IRQ.
          */
         if (pl011_dma_tx_refill(uap) > 0) {
                 uap->im &= ~UART011_TXIM;