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

Conflicts:
	drivers/net/smsc911x.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index 57d2ffbbb433..74efb5a2ad41 100644
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -416,7 +416,7 @@ static netdev_tx_t at91_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         stats->tx_bytes += cf->can_dlc;
 
-        /* _NOTE_: substract AT91_MB_TX_FIRST offset from mb! */
+        /* _NOTE_: subtract AT91_MB_TX_FIRST offset from mb! */
         can_put_echo_skb(skb, dev, mb - AT91_MB_TX_FIRST);
 
         /*
@@ -782,7 +782,7 @@ static void at91_irq_tx(struct net_device *dev, u32 reg_sr)
                 reg_msr = at91_read(priv, AT91_MSR(mb));
                 if (likely(reg_msr & AT91_MSR_MRDY &&
                            ~reg_msr & AT91_MSR_MABT)) {
-                        /* _NOTE_: substract AT91_MB_TX_FIRST offset from mb! */
+                        /* _NOTE_: subtract AT91_MB_TX_FIRST offset from mb! */
                         can_get_echo_skb(dev, mb - AT91_MB_TX_FIRST);
                         dev->stats.tx_packets++;
                 }