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

Conflicts:
	drivers/net/smsc911x.c

2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
index f9f6645b2e61..bfa2d56af1ee 100644
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -199,7 +199,7 @@ static inline void refill_rspq(struct adapter *adapter,
  *      need_skb_unmap - does the platform need unmapping of sk_buffs?
  *
  *      Returns true if the platform needs sk_buff unmapping.  The compiler
- *      optimizes away unecessary code if this returns true.
+ *      optimizes away unnecessary code if this returns true.
  */
 static inline int need_skb_unmap(void)
 {
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index d55db6b38e7b..c688421da9c7 100644
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -1386,11 +1386,11 @@ struct intr_info {
  *      @reg: the interrupt status register to process
  *      @mask: a mask to apply to the interrupt status
  *      @acts: table of interrupt actions
- *      @stats: statistics counters tracking interrupt occurences
+ *      @stats: statistics counters tracking interrupt occurrences
  *
  *      A table driven interrupt handler that applies a set of masks to an
  *      interrupt status word and performs the corresponding actions if the
- *      interrupts described by the mask have occured.  The actions include
+ *      interrupts described by the mask have occurred.  The actions include
  *      optionally printing a warning or alert message, and optionally
  *      incrementing a stat counter.  The table is terminated by an entry
  *      specifying mask 0.  Returns the number of fatal interrupt conditions.
@@ -2783,7 +2783,7 @@ static void init_mtus(unsigned short mtus[])
 {
         /*
          * See draft-mathis-plpmtud-00.txt for the values.  The min is 88 so
-         * it can accomodate max size TCP/IP headers when SACK and timestamps
+         * it can accommodate max size TCP/IP headers when SACK and timestamps
          * are enabled and still have at least 8 bytes of payload.
          */
         mtus[0] = 88;