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/infiniband/hw/qib/qib_ud.c b/drivers/infiniband/hw/qib/qib_ud.c
index 4a51fd1e9cb..828609fa4d2 100644
--- a/drivers/infiniband/hw/qib/qib_ud.c
+++ b/drivers/infiniband/hw/qib/qib_ud.c
@@ -116,7 +116,7 @@ static void qib_ud_loopback(struct qib_qp *sqp, struct qib_swqe *swqe)
         }
 
         /*
-         * A GRH is expected to preceed the data even if not
+         * A GRH is expected to precede the data even if not
          * present on the wire.
          */
         length = swqe->length;
@@ -520,7 +520,7 @@ void qib_ud_rcv(struct qib_ibport *ibp, struct qib_ib_header *hdr,
                 goto drop;
 
         /*
-         * A GRH is expected to preceed the data even if not
+         * A GRH is expected to precede the data even if not
          * present on the wire.
          */
         wc.byte_len = tlen + sizeof(struct ib_grh);