Merge branch 'master'; commit 'v2.6.39-rc3' into next

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/tty/serial/8250.c b/drivers/tty/serial/8250.c
index b3b881bc4712..6611535f4440 100644
--- a/drivers/tty/serial/8250.c
+++ b/drivers/tty/serial/8250.c
@@ -1629,7 +1629,7 @@ static irqreturn_t serial8250_interrupt(int irq, void *dev_id)
                             up->port.iotype == UPIO_DWAPB32) &&
                           (iir & UART_IIR_BUSY) == UART_IIR_BUSY) {
                         /* The DesignWare APB UART has an Busy Detect (0x07)
-                         * interrupt meaning an LCR write attempt occured while the
+                         * interrupt meaning an LCR write attempt occurred while the
                          * UART was busy. The interrupt must be cleared by reading
                          * the UART status register (USR) and the LCR re-written. */
                         unsigned int status;