Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/smsc911x.c

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
index 5b9cde79e4e..e1c8d4f1ce5 100644
--- a/drivers/tty/serial/pmac_zilog.c
+++ b/drivers/tty/serial/pmac_zilog.c
@@ -330,7 +330,7 @@ static struct tty_struct *pmz_receive_chars(struct uart_pmac_port *uap)
                  * When that happens, I disable the receive side of the driver.
                  * Note that what I've been experiencing is a real irq loop where
                  * I'm getting flooded regardless of the actual port speed.
-                 * Something stange is going on with the HW
+                 * Something strange is going on with the HW
                  */
                 if ((++loops) > 1000)
                         goto flood;
@@ -396,7 +396,7 @@ static void pmz_transmit_chars(struct uart_pmac_port *uap)
                  * be nice to transmit console writes just like we normally would for
                  * a TTY line. (ie. buffered and TX interrupt driven).  That is not
                  * easy because console writes cannot sleep.  One solution might be
-                 * to poll on enough port->xmit space becomming free.  -DaveM
+                 * to poll on enough port->xmit space becoming free.  -DaveM
                  */
                 if (!(status & Tx_BUF_EMP))
                         return;
@@ -809,7 +809,7 @@ static int pmz_set_scc_power(struct uart_pmac_port *uap, int state)
 #endif /* !CONFIG_PPC_PMAC */
 
 /*
- * FixZeroBug....Works around a bug in the SCC receving channel.
+ * FixZeroBug....Works around a bug in the SCC receiving channel.
  * Inspired from Darwin code, 15 Sept. 2000  -DanM
  *
  * The following sequence prevents a problem that is seen with O'Hare ASICs