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, 3 insertions, 3 deletions

diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
index 10800f16a231..ff32befd8443 100644
--- a/drivers/net/tokenring/3c359.c
+++ b/drivers/net/tokenring/3c359.c
@@ -208,7 +208,7 @@ static void print_rx_state(struct net_device *dev)
  *      passing/getting the next value from the nic. As with all requests
  *      on this nic it has to be done in two stages, a) tell the nic which
  *      memory address you want to access and b) pass/get the value from the nic.
- *      With the EEProm, you have to wait before and inbetween access a) and b).
+ *      With the EEProm, you have to wait before and between access a) and b).
  *      As this is only read at initialization time and the wait period is very 
  *      small we shouldn't have to worry about scheduling issues.
  */
@@ -1251,7 +1251,7 @@ static netdev_tx_t xl_xmit(struct sk_buff *skb, struct net_device *dev)
 /* 
  * The NIC has told us that a packet has been downloaded onto the card, we must
  * find out which packet it has done, clear the skb and information for the packet
- * then advance around the ring for all tranmitted packets
+ * then advance around the ring for all transmitted packets
  */
 
 static void xl_dn_comp(struct net_device *dev) 
@@ -1568,7 +1568,7 @@ static void xl_arb_cmd(struct net_device *dev)
                         if (lan_status_diff & LSC_SOFT_ERR)
                                         printk(KERN_WARNING "%s: Adapter transmitted Soft Error Report Mac Frame\n",dev->name);
                         if (lan_status_diff & LSC_TRAN_BCN) 
-                                        printk(KERN_INFO "%s: We are tranmitting the beacon, aaah\n",dev->name);
+                                        printk(KERN_INFO "%s: We are transmitting the beacon, aaah\n",dev->name);
                         if (lan_status_diff & LSC_SS) 
                                         printk(KERN_INFO "%s: Single Station on the ring\n", dev->name);
                         if (lan_status_diff & LSC_RING_REC)