Merge master.kernel.org:/home/rmk/linux-2.6-serial

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 5b65e208893bc80df44179ceb2dd5d6a32b1dccc..4d75cdfa0a0af00bd928faae571008dcbac4d0a2 100644 (file)
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -864,7 +864,7 @@ static void autoconfig(struct uart_8250_port *up, unsigned int probeflags)
        /*
         * We're pretty sure there's a port here.  Lets find out what
         * type of port it is.  The IIR top two bits allows us to find
-        * out if its 8250 or 16450, 16550, 16550A or later.  This
+        * out if it's 8250 or 16450, 16550, 16550A or later.  This
         * determines what we test for next.
         *
         * We also initialise the EFR (if any) to zero for later.  The