Merge branch 'master' into for-next

Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index 41d9911202d0..ee648fe5d96f 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -1584,7 +1584,7 @@ static void ace_watchdog(struct net_device *data)
         /*
          * We haven't received a stats update event for more than 2.5
          * seconds and there is data in the transmit queue, thus we
-         * asume the card is stuck.
+         * assume the card is stuck.
          */
         if (*ap->tx_csm != ap->tx_ret_csm) {
                 printk(KERN_WARNING "%s: Transmitter is stuck, %08x\n",
@@ -2564,7 +2564,7 @@ restart:
 
                 /*
                  * A TX-descriptor producer (an IRQ) might have gotten
-                 * inbetween, making the ring free again. Since xmit is
+                 * between, making the ring free again. Since xmit is
                  * serialized, this is the only situation we have to
                  * re-test.
                  */